diff --git a/tools/common/include/commoneditor.hpp b/tools/common/include/commoneditor.hpp
index 3e9161f..c1db369 100755
--- a/tools/common/include/commoneditor.hpp
+++ b/tools/common/include/commoneditor.hpp
@@ -25,7 +25,7 @@
 
 class TransformCommand : public Command {
 public:
-    Object transformed;
+    prism::Object transformed;
     
     Transform old_transform, new_transform;
     
@@ -44,7 +44,7 @@ public:
 
 class RenameCommand : public Command {
 public:
-    Object object;
+    prism::Object object;
     
     std::string old_name, new_name;
     
@@ -63,10 +63,10 @@ public:
 
 class ChangeParentCommand : public Command {
 public:
-    Object object;
+    prism::Object object;
     
-    Object old_parent;
-    Object new_parent;
+    prism::Object old_parent;
+    prism::Object new_parent;
     
     std::string fetch_name() override {
         return "Change parent of " + engine->get_scene()->get(object).name + " to " + engine->get_scene()->get(new_parent).name;
@@ -129,7 +129,7 @@ public:
 
     virtual void updateEditor([[maybe_unused]] float deltaTime) {}
 
-    virtual void object_selected([[maybe_unused]] Object object) {}
+    virtual void object_selected([[maybe_unused]] prism::Object object) {}
     virtual void asset_selected([[maybe_unused]] const std::filesystem::path& path, [[maybe_unused]] AssetType type) {}
 
     bool wants_no_scene_rendering() override { return true; }
@@ -155,7 +155,7 @@ public:
     
     void set_undo_stack(UndoStack* stack);
 
-    Object selected_object = prism::NullObject;
+    prism::Object selected_object = prism::NullObject;
     
     GFXTexture* get_material_preview(Material& material);
     GFXTexture* get_mesh_preview(Mesh& mesh);
@@ -349,9 +349,9 @@ private:
 	int defaultX, defaultY, defaultWidth, defaultHeight;
 	std::vector<std::string> lastOpenedFiles;
 
-    void walkObject(Object object, Object parentObject = prism::NullObject);
+    void walkObject(prism::Object object, prism::Object parentObject = prism::NullObject);
     
-    void editTransform(Object object, Transform transform);
+    void editTransform(prism::Object object, Transform transform);
     void editRenderable(Renderable& mesh);
 };
 
@@ -382,8 +382,8 @@ class SelectionCommand : public Command {
 public:
     CommonEditor* editor = nullptr;
     
-    Object new_selection;
-    Object old_selection;
+    prism::Object new_selection;
+    prism::Object old_selection;
     
     std::string fetch_name() override {
         return "Change selection to " + engine->get_scene()->get(new_selection).name;
diff --git a/tools/common/include/debugpass.hpp b/tools/common/include/debugpass.hpp
index eaa4449..3fca93e 100755
--- a/tools/common/include/debugpass.hpp
+++ b/tools/common/include/debugpass.hpp
@@ -63,7 +63,7 @@ public:
     GFXTexture* selectDepthTexture = nullptr;
     GFXTexture* sobelTexture = nullptr;
 
-    Object selected_object = prism::NullObject;
+    prism::Object selected_object = prism::NullObject;
     
 private:
     void createOffscreenResources();
diff --git a/tools/common/src/commoneditor.cpp b/tools/common/src/commoneditor.cpp
index 2cd2987..fcd2201 100755
--- a/tools/common/src/commoneditor.cpp
+++ b/tools/common/src/commoneditor.cpp
@@ -311,7 +311,7 @@ std::vector<std::string> CommonEditor::getOpenedFiles() const {
     return lastOpenedFiles;
 }
 
-void CommonEditor::walkObject(Object object, Object) {
+void CommonEditor::walkObject(prism::Object object, prism::Object) {
     static ImGuiTreeNodeFlags base_flags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_SpanAvailWidth;
     
     auto& data = engine->get_scene()->get<Data>(object);
@@ -343,7 +343,7 @@ void CommonEditor::walkObject(Object object, Object) {
         }
         
         if(ImGui::Button("Duplicate")) {
-            Object obj = engine->get_scene()->duplicate_object(object);
+            prism::Object obj = engine->get_scene()->duplicate_object(object);
             engine->get_scene()->get(obj).name += "duplicate";
             
             selected_object = obj;
@@ -390,7 +390,7 @@ bool IsItemActiveLastFrame() {
     return false;
 }
 
-void CommonEditor::editTransform(Object object, Transform transform) {
+void CommonEditor::editTransform(prism::Object object, Transform transform) {
     bool is_done_editing = false;
     bool started_edit = false;
     auto changed = ImGui::DragFloat3("Position", transform.position.ptr());
@@ -469,7 +469,7 @@ void editProbe(EnvironmentProbe& probe) {
 }
 
 template<typename T>
-bool componentHeader(Scene& scene, Object& object, const char* name, const bool removable = true) {
+bool componentHeader(Scene& scene, prism::Object& object, const char* name, const bool removable = true) {
     if(!scene.has<T>(object))
         return false;
     
@@ -850,7 +850,7 @@ GFXTexture* CommonEditor::get_texture_preview(Texture& texture) {
     
     auto renderer = engine->get_renderer();
 
-    GFXCommandBuffer* command_buffer = gfx->acquire_command_buffer();
+    GFXCommandBuffer* command_buffer = gfx->acquire_command_buffer(false);
     
     GFXRenderPassBeginInfo begin_info = {};
     begin_info.render_area.extent = {thumbnail_resolution, thumbnail_resolution};
@@ -883,7 +883,7 @@ GFXTexture* CommonEditor::get_texture_preview(Texture& texture) {
     
     command_buffer->draw(0, 4, 0, 1);
     
-    gfx->submit(command_buffer);
+    gfx->submit(command_buffer, nullptr);
     
     return final_texture;
 }
@@ -957,7 +957,7 @@ GFXTexture* CommonEditor::generate_common_preview(Scene& scene, const prism::flo
     
     auto final_framebuffer = gfx->create_framebuffer(framebuffer_create_info);
     
-    GFXCommandBuffer* command_buffer = gfx->acquire_command_buffer();
+    GFXCommandBuffer* command_buffer = gfx->acquire_command_buffer(false);
     
     renderer->shadow_pass->render(command_buffer, scene);
 
@@ -1004,7 +1004,7 @@ GFXTexture* CommonEditor::generate_common_preview(Scene& scene, const prism::flo
     
     command_buffer->draw(0, 4, 0, 1);
     
-    gfx->submit(command_buffer);
+    gfx->submit(command_buffer, nullptr);
     
     return final_texture;
 }
diff --git a/tools/common/src/debugpass.cpp b/tools/common/src/debugpass.cpp
index 35ada4f..f66f1c1 100755
--- a/tools/common/src/debugpass.cpp
+++ b/tools/common/src/debugpass.cpp
@@ -490,7 +490,7 @@ void DebugPass::get_selected_object(int x, int y, const std::function<void(Selec
         add_arrow(SelectableObject::Axis::Z, translate_model * matrix_from_quat(angle_axis(radians(90.0f), prism::float3(1, 0, 0))) * scale_model);
     }
     
-    GFXCommandBuffer* commandBuffer = engine->get_gfx()->acquire_command_buffer();
+    GFXCommandBuffer* commandBuffer = engine->get_gfx()->acquire_command_buffer(false);
 
     GFXRenderPassBeginInfo info = {};
     info.clear_color.a = 0.0;
@@ -555,7 +555,7 @@ void DebugPass::get_selected_object(int x, int y, const std::function<void(Selec
             commandBuffer->draw_indexed(part.index_count, part.index_offset, part.vertex_offset, 0);
     }
 
-    engine->get_gfx()->submit(commandBuffer);
+    engine->get_gfx()->submit(commandBuffer, nullptr);
     
     engine->get_gfx()->copy_texture(selectTexture, selectBuffer);