diff --git a/VirtualComputer-Core/dependency-reduced-pom.xml b/VirtualComputer-Core/dependency-reduced-pom.xml
index 3a2283f..e42fa8a 100644
--- a/VirtualComputer-Core/dependency-reduced-pom.xml
+++ b/VirtualComputer-Core/dependency-reduced-pom.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>VirtualComputer</artifactId>
     <groupId>io.github.NorbiPeti</groupId>
+        <version>2.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>VirtualComputer-Core</artifactId>
     <version>2.1-SNAPSHOT</version>
     <build>
@@ -50,6 +54,7 @@
                                     <artifactSet>
                                         <excludes>
                                             <exclude>org.virtualbox:VirtualBox-MSCOM</exclude>
+                                            <exclude>sznp.virtualcomputer:VirtualComputer-MSCOM</exclude>
                                         </excludes>
                                     </artifactSet>
                                 </configuration>
@@ -75,6 +80,7 @@
                                     <artifactSet>
                                         <excludes>
                                             <exclude>org.virtualbox:VirtualBox</exclude>
+                                            <exclude>sznp.virtualcomputer:VirtualComputer-XPCOM</exclude>
                                         </excludes>
                                     </artifactSet>
                                 </configuration>
@@ -85,17 +91,31 @@
             </build>
         </profile>
     </profiles>
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-        </repository>
-        <repository>
-            <id>repo</id>
-            <url>file://${basedir}/repo</url>
-        </repository>
-    </repositories>
     <dependencies>
+        <dependency>
+            <groupId>org.virtualbox</groupId>
+            <artifactId>VirtualBox-MSCOM</artifactId>
+            <version>6.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>sznp.virtualcomputer</groupId>
+            <artifactId>VirtualComputer-MSCOM</artifactId>
+            <version>2.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hamcrest-core</artifactId>
+                    <groupId>org.hamcrest</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
@@ -128,12 +148,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.virtualbox</groupId>
-            <artifactId>VirtualBox-MSCOM</artifactId>
-            <version>6.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>
 
diff --git a/VirtualComputer-Core/pom.xml b/VirtualComputer-Core/pom.xml
index 7cb7c1a..f55b3cd 100644
--- a/VirtualComputer-Core/pom.xml
+++ b/VirtualComputer-Core/pom.xml
@@ -77,7 +77,7 @@
                                     <artifactSet>
                                         <excludes>
                                             <exclude>org.virtualbox:VirtualBox-MSCOM</exclude>
-											<exclude>sznp.virtualcomputer.VirtualComputer-MSCOM</exclude>
+											<exclude>sznp.virtualcomputer:VirtualComputer-MSCOM</exclude>
                                         </excludes>
                                     </artifactSet>
                                 </configuration>
@@ -103,7 +103,7 @@
                                     <artifactSet>
                                         <excludes>
                                             <exclude>org.virtualbox:VirtualBox</exclude>
-											<exclude>sznp.virtualcomputer.VirtualComputer-XPCOM</exclude>
+											<exclude>sznp.virtualcomputer:VirtualComputer-XPCOM</exclude>
                                         </excludes>
                                     </artifactSet>
                                 </configuration>
diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java
index 4bf50f9..21eade2 100644
--- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java
+++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/Computer.java
@@ -9,6 +9,7 @@ import org.virtualbox_6_0.*;
 import sznp.virtualcomputer.events.MachineEventHandler;
 import sznp.virtualcomputer.events.VBoxEventHandler;
 import sznp.virtualcomputer.renderer.GPURenderer;
+import sznp.virtualcomputer.renderer.MCFrameBuffer;
 import sznp.virtualcomputer.util.COMUtils;
 import sznp.virtualcomputer.util.Scancode;
 
@@ -86,7 +87,7 @@ public final class Computer {
 	    handler.setProgress(progress);
 	    handler.registerTo(progress.getEventSource()); //TODO: Show progress bar some way?
         console.getDisplay().attachFramebuffer(0L,
-                COMUtils.gimmeAFramebuffer(new COMFrameBuffer(console.getDisplay(), true)));
+                COMUtils.gimmeAFramebuffer(new MCFrameBuffer(console.getDisplay())));
     }
 
     private void sendMessage(@Nullable CommandSender sender, String message) {
diff --git a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java
index 353e035..3589d47 100644
--- a/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java
+++ b/VirtualComputer-Core/src/main/java/sznp/virtualcomputer/renderer/MCFrameBuffer.java
@@ -9,6 +9,7 @@ import org.virtualbox_6_0.IDisplay;
 import org.virtualbox_6_0.IDisplaySourceBitmap;
 import org.virtualbox_6_0.VBoxException;
 import sznp.virtualcomputer.PluginMain;
+import sznp.virtualcomputer.util.COMUtils;
 import sznp.virtualcomputer.util.IMCFrameBuffer;
 import sznp.virtualcomputer.util.Timing;
 
@@ -29,7 +30,7 @@ public class MCFrameBuffer implements IMCFrameBuffer {
 			try {
 				display.querySourceBitmap(0L, holder);
 				long[] ptr = new long[1], w = new long[1], h = new long[1], bpp = new long[1], bpl = new long[1], pf = new long[1];
-				holder.value.getTypedWrapped().queryBitmapInfo(ptr, w, h, bpp, bpl, pf);
+				COMUtils.queryBitmapInfo(holder.value, ptr, w, h, bpp, bpl, pf);
 				if (PluginMain.direct) {
 					pointer = new Pointer(ptr[0]);
 					this.width = (int) w[0];
diff --git a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/COMUtils.java b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/COMUtils.java
index f2570df..266004f 100644
--- a/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/COMUtils.java
+++ b/VirtualComputerXPCOM/src/main/java/sznp/virtualcomputer/util/COMUtils.java
@@ -1,11 +1,9 @@
 package sznp.virtualcomputer.util;
 
 import lombok.val;
-import org.virtualbox_6_0.IEvent;
-import org.virtualbox_6_0.IEventSource;
-import org.virtualbox_6_0.IFramebuffer;
-import org.virtualbox_6_0.VBoxEventType;
+import org.virtualbox_6_0.*;
 import org.virtualbox_6_0.xpcom.IUnknown;
+import sznp.virtualcomputer.COMFrameBuffer;
 import sznp.virtualcomputer.EventHandler;
 
 import java.lang.reflect.InvocationTargetException;
@@ -34,6 +32,10 @@ public final class COMUtils {
     }
 
     public static IFramebuffer gimmeAFramebuffer(IMCFrameBuffer frameBuffer) {
-        return new IFramebuffer(frameBuffer); //TODO
+        return new IFramebuffer(new COMFrameBuffer(frameBuffer));
+    }
+
+    public static void queryBitmapInfo(IDisplaySourceBitmap bitmap, long[] ptr, long[] w, long[] h, long[] bpp, long[] bpl, long[] pf) {
+        bitmap.getTypedWrapped().queryBitmapInfo(ptr, w, h, bpp, bpl, pf);
     }
 }