diff --git a/src/BaseOperator.cpp b/src/BaseOperator.cpp
index 9bea5929b..2b81ab574 100644
--- a/src/BaseOperator.cpp
+++ b/src/BaseOperator.cpp
@@ -14,7 +14,7 @@ BaseOperator::BaseOperator() {
 
 }
 
-BaseOperator::BaseOperator(vk::CommandBuffer* commandBuffer) {
+BaseOperator::BaseOperator(std::shared_ptr<vk::CommandBuffer> commandBuffer) {
     SPDLOG_DEBUG("Compute BaseOperator constructor started");
     this->mCommandBuffer = commandBuffer;
 }
diff --git a/src/BaseOperator.hpp b/src/BaseOperator.hpp
index 32d54963b..656622d81 100644
--- a/src/BaseOperator.hpp
+++ b/src/BaseOperator.hpp
@@ -14,15 +14,15 @@ private:
 
 public:
     BaseOperator();
-    BaseOperator(vk::CommandBuffer* commandBuffer);
+    BaseOperator(std::shared_ptr<vk::CommandBuffer> commandBuffer);
     virtual ~BaseOperator();
 
     void init(std::string one, std::string two);
     void record();
 
 private:
-    vk::Device* mDevice;
-    vk::CommandBuffer* mCommandBuffer;
+    std::shared_ptr<vk::Device> mDevice;
+    std::shared_ptr<vk::CommandBuffer> mCommandBuffer;
 
 };
 
diff --git a/src/Manager.hpp b/src/Manager.hpp
index 569a0fef3..7bee55acc 100644
--- a/src/Manager.hpp
+++ b/src/Manager.hpp
@@ -21,6 +21,8 @@ private:
 public:
     Manager();
 
+    //Manager(std::shared_ptr<vk::Instance> instance, std::shared_ptr<vk::Device>, uint32_t queueIndex);
+
     ~Manager();
 
     // Evaluate actions