diff --git a/README.md b/README.md
index 481e91e..34cc16c 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 ### Adjustments and improvements
 
 The project is still under development and the next updates will focus on the following tasks:
-- [ ] Finish basic classes
+- [x] Finish basic classes
 - [ ] Code refactoring and cleaning
 - [ ] 3D support
 - [ ] Content Pipeline
diff --git a/framework/xna.cpp b/framework/xna.cpp
index 672ad61..0f74d87 100644
--- a/framework/xna.cpp
+++ b/framework/xna.cpp
@@ -27,7 +27,7 @@ namespace xna {
 		void LoadContent() override {
 			spriteBatch = New<SpriteBatch>(*graphicsDevice);		
 
-			texture = Content()->Load<sptr<Texture2D>>("idle");
+			texture = Content()->Load<PTexture2D>("idle");
 
 			Game::LoadContent();
 		}
diff --git a/inc/forward.hpp b/inc/forward.hpp
index a42ed22..5247bd2 100644
--- a/inc/forward.hpp
+++ b/inc/forward.hpp
@@ -88,9 +88,6 @@ namespace xna {
 	struct GamePadState;
 	struct KeyboardState;
 	struct MouseState;
-
-	//Pointer
-	using PTexture2D = std::shared_ptr<Texture2D>;
 }
 
 #endif
\ No newline at end of file
diff --git a/inc/graphics/texture.hpp b/inc/graphics/texture.hpp
index 26ea477..c9a6206 100644
--- a/inc/graphics/texture.hpp
+++ b/inc/graphics/texture.hpp
@@ -32,6 +32,10 @@ namespace xna {
 		struct PlatformImplementation;
 		uptr<PlatformImplementation> impl = nullptr;
 	};
+
+	
+	using PTexture2D = sptr<Texture2D>;
+	using UTexture2D = uptr<Texture2D>;
 }
 
 #endif
\ No newline at end of file