diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70d6a98e..fd96ef8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,34 +35,34 @@ set(SOURCES
 	sources/Component/Keyboard/KeyboardComponent.hpp
 	sources/Component/Health/HealthComponent.cpp
 	sources/Component/Health/HealthComponent.hpp
-#	sources/System/Movable/MovableSystem.hpp
-#	sources/System/Movable/MovableSystem.cpp
-#	sources/System/Controllable/ControllableSystem.cpp
-#	sources/System/Controllable/ControllableSystem.hpp
-#	sources/System/Gamepad/GamepadSystem.cpp
-#	sources/System/Gamepad/GamepadSystem.hpp
-#	sources/System/Health/HealthSystem.cpp
-#	sources/System/Health/HealthSystem.hpp
-#	sources/System/Keyboard/KeyboardSystem.cpp
-#	sources/System/Keyboard/KeyboardSystem.hpp
-#	sources/System/Movable/MovableSystem.cpp
-#	sources/System/Movable/MovableSystem.hpp
+	sources/System/Movable/MovableSystem.hpp
+	sources/System/Movable/MovableSystem.cpp
+	sources/System/Controllable/ControllableSystem.cpp
+	sources/System/Controllable/ControllableSystem.hpp
+	sources/System/Gamepad/GamepadSystem.cpp
+	sources/System/Gamepad/GamepadSystem.hpp
+	sources/System/Health/HealthSystem.cpp
+	sources/System/Health/HealthSystem.hpp
+	sources/System/Keyboard/KeyboardSystem.cpp
+	sources/System/Keyboard/KeyboardSystem.hpp
+	sources/System/Movable/MovableSystem.cpp
+	sources/System/Movable/MovableSystem.hpp
 	sources/Models/Vector3.hpp
 	sources/Component/GridCentered/GridCenteredComponent.cpp
 	sources/Component/GridCentered/GridCenteredComponent.hpp
-#	sources/System/GridCentered/GridCenteredSystem.cpp
-#	sources/System/GridCentered/GridCenteredSystem.hpp
+	sources/System/GridCentered/GridCenteredSystem.cpp
+	sources/System/GridCentered/GridCenteredSystem.hpp
 	sources/Models/Vector2.hpp
 	sources/Component/Renderer/Drawable2DComponent.hpp
 	sources/Component/Renderer/Drawable3DComponent.hpp
-#	sources/System/Renderer/RenderSystem.hpp
-#	sources/System/Renderer/RenderSystem.cpp
+	sources/System/Renderer/RenderSystem.hpp
+	sources/System/Renderer/RenderSystem.cpp
 	sources/Component/Renderer/CameraComponent.cpp
 	sources/Component/Renderer/CameraComponent.hpp
 	sources/Component/Animation/AnimationsComponent.cpp
 	sources/Component/Animation/AnimationsComponent.hpp
-#	sources/System/Animation/AnimationsSystem.cpp
-#	sources/System/Animation/AnimationsSystem.hpp
+	sources/System/Animation/AnimationsSystem.cpp
+	sources/System/Animation/AnimationsSystem.hpp
 	sources/Component/Collision/CollisionComponent.cpp
 	sources/Component/Collision/CollisionComponent.hpp
 	sources/System/Collision/CollisionSystem.hpp
diff --git a/lib/wal/sources/System/System.hpp b/lib/wal/sources/System/System.hpp
index c21de9d2..58f49970 100644
--- a/lib/wal/sources/System/System.hpp
+++ b/lib/wal/sources/System/System.hpp
@@ -12,6 +12,7 @@
 #include "Wal.hpp"
 #include "View/View.hpp"
 #include "ISystem.hpp"
+#include <iostream>
 
 namespace WAL
 {
@@ -50,7 +51,7 @@ namespace WAL
 		//! @param dtime The delta time since the last call to this method.
 		void update(std::chrono::nanoseconds dtime) final
 		{
-			for (auto entity : this->getView())
+			for (auto &entity : this->getView())
 				this->onUpdate(entity, dtime);
 			this->onSelfUpdate();
 		}
@@ -59,7 +60,7 @@ namespace WAL
 		//! @remark This should be used for Physics, AI and everything that could be imprecise due to float rounding.
 		void fixedUpdate() final
 		{
-			for (auto entity : this->getView())
+			for (auto &entity : this->getView())
 				this->onFixedUpdate(entity);
 		}
 	protected:
diff --git a/lib/wal/sources/View/View.hpp b/lib/wal/sources/View/View.hpp
index 1c3ba2d9..cbee789e 100644
--- a/lib/wal/sources/View/View.hpp
+++ b/lib/wal/sources/View/View.hpp
@@ -9,6 +9,8 @@
 #include <tuple>
 #include <typeindex>
 #include <functional>
+#include <utility>
+#include <optional>
 #include "Entity/Entity.hpp"
 
 namespace WAL
@@ -43,6 +45,12 @@ namespace WAL
 		{
 			return std::get<std::reference_wrapper<T>>(this->_value);
 		}
+
+		template<std::size_t I>
+		auto &get()
+		{
+			return std::get<I>(this->_value);
+		}
 	};
 
 	template<typename It, typename ...Components>
@@ -50,18 +58,19 @@ namespace WAL
 	{
 	private:
 		It _it;
+		std::optional<ViewEntity<Components...>> _entity;
 
 	public:
-		ViewEntity<Components...> operator*()
+		ViewEntity<Components...> &operator*()
 		{
-			ViewEntity<Components...> entity(*this->_it);
-			return entity;
+			this->_entity.emplace(*this->_it);
+			return this->_entity.value();
 		}
 
-		ViewEntity<Components...> operator->()
+		ViewEntity<Components...> *operator->()
 		{
-			ViewEntity<Components...> entity(*this->_it);
-			return entity;
+			this->_entity.emplace(*this->_it);
+			return &this->_entity;
 		}
 
 		ViewIterator &operator++()
@@ -88,7 +97,8 @@ namespace WAL
 		}
 
 		explicit ViewIterator(It current)
-			: _it(current)
+			: _it(current),
+			_entity(std::nullopt)
 		{}
 	};
 
@@ -129,7 +139,22 @@ namespace WAL
 
 		iterator end()
 		{
-			return iterator(this->_entities.begin());
+			return iterator(this->_entities.end());
+		}
+
+		std::size_t size() const
+		{
+			return this->_entities.size();
+		}
+
+		ViewEntity<Components...> front()
+		{
+			return *iterator(this->_entities.begin());
+		}
+
+		ViewEntity<Components...> back()
+		{
+			return *iterator(--this->_entities.end());
 		}
 
 		const std::vector<std::type_index> &getTypes() const override
@@ -137,14 +162,21 @@ namespace WAL
 			return this->_types;
 		}
 
-		void emplace_back(Entity &) override
+		void emplace_back(Entity &entity) override
 		{
-
+			auto tuple = std::make_tuple<Components *...>(entity.tryGetComponent<Components>()...);
+			if (std::apply([](const auto *...component) {return ((component == nullptr) || ...);}, tuple))
+				return;
+			std::apply([&](auto *...component) {
+				this->_entities.emplace_back(entity, *component...);
+			}, tuple);
 		}
 
-		void erase(const Entity &) override
+		void erase(const Entity &entity) override
 		{
-
+			this->_entities.erase(std::remove_if(this->_entities.begin(), this->_entities.end(), [&entity](const auto &ref){
+				return &std::get<0>(ref).get() == &entity;
+			}));
 		}
 
 		//! @brief Construct a view from a list of entities.
@@ -152,14 +184,8 @@ namespace WAL
 		explicit View(std::list<Entity> &scene)
 		{
 			this->_types = {typeid(Components)...};
-			for (auto &entity : scene) {
-				auto tuple = std::make_tuple<Components *...>(entity.tryGetComponent<Components>()...);
-				if (std::apply([](const auto *...component) {return ((component == nullptr) || ...);}, tuple))
-					continue;
-				std::apply([&](auto *...component) {
-					this->_entities.emplace_back(entity, *component...);
-				}, tuple);
-			}
+			for (auto &entity : scene)
+				this->emplace_back(entity);
 		}
 
 		//! @brief Copying a view is not possible since a view must be managed by a scene.
@@ -169,4 +195,24 @@ namespace WAL
 		//! @brief A view is not assignable.
 		View &operator=(const View &) = delete;
 	};
+}
+
+namespace std
+{
+	template<typename ...Components>
+	struct tuple_size<::WAL::ViewEntity<Components...>>
+		: public std::integral_constant<std::size_t, 1 + sizeof...(Components)>
+	{};
+
+	template<typename ...Components>
+	struct tuple_element<0, ::WAL::ViewEntity<Components...>>
+	{
+		using type = WAL::Entity &;
+	};
+
+	template<std::size_t N, typename ...Components>
+	struct tuple_element<N, ::WAL::ViewEntity<Components...>>
+	{
+		using type = typename std::tuple_element<N - 1, std::tuple<Components...>>::type;
+	};
 }
\ No newline at end of file
diff --git a/sources/Runner/Runner.cpp b/sources/Runner/Runner.cpp
index ff933fff..6dbce849 100644
--- a/sources/Runner/Runner.cpp
+++ b/sources/Runner/Runner.cpp
@@ -4,33 +4,28 @@
 
 #include <Wal.hpp>
 #include <iostream>
-//#include "System/Movable/MovableSystem.hpp"
-//#include "System/Renderer/RenderSystem.hpp"
+#include "System/Movable/MovableSystem.hpp"
+#include "System/Renderer/RenderSystem.hpp"
 #include <Model/Model.hpp>
 #include <Drawables/3D/Cube.hpp>
-#include <Drawables/2D/Rectangle.hpp>
-//#include <Drawables/3D/Cube.hpp>
 #include <TraceLog.hpp>
-//#include <System/Keyboard/KeyboardSystem.hpp>
-//#include <System/Controllable/ControllableSystem.hpp>
+#include <System/Keyboard/KeyboardSystem.hpp>
+#include <System/Controllable/ControllableSystem.hpp>
 #include <System/Collision/CollisionSystem.hpp>
 #include <Component/Movable/MovableComponent.hpp>
 #include <Component/Collision/CollisionComponent.hpp>
 #include <Component/Controllable/ControllableComponent.hpp>
 #include <Component/Keyboard/KeyboardComponent.hpp>
-//#include <System/Gamepad/GamepadSystem.hpp>
-//#include "Models/Vector2.hpp"
+#include <System/Gamepad/GamepadSystem.hpp>
 #include "Component/Renderer/CameraComponent.hpp"
-//#include "Component/Renderer/Drawable2DComponent.hpp"
 #include "Component/Renderer/Drawable3DComponent.hpp"
 #include "Runner.hpp"
 #include "Models/GameState.hpp"
 #include <Model/ModelAnimations.hpp>
 #include "Component/Animation/AnimationsComponent.hpp"
-//#include "System/Animation/AnimationsSystem.hpp"
+#include "System/Animation/AnimationsSystem.hpp"
 #include "Map/Map.hpp"
 
-namespace RAY2D = RAY::Drawables::Drawables2D;
 namespace RAY3D = RAY::Drawables::Drawables3D;
 
 namespace BBM
@@ -47,22 +42,22 @@ namespace BBM
 
 	void addSystems(WAL::Wal &wal)
 	{
-		wal.addSystem<CollisionSystem>();
-		//		wal.addSystem<KeyboardSystem>()
-//			.addSystem<GamepadSystem>()
-//			.addSystem<ControllableSystem>()
-//			.addSystem<CollisionSystem>()
-//			.addSystem<MovableSystem>();
+		wal.addSystem<KeyboardSystem>()
+			.addSystem<GamepadSystem>()
+			.addSystem<ControllableSystem>()
+			.addSystem<CollisionSystem>()
+			.addSystem<MovableSystem>();
 	}
 
 	void enableRaylib(WAL::Wal &wal)
 	{
 		RAY::TraceLog::setLevel(LOG_WARNING);
 		RAY::Window &window = RAY::Window::getInstance(600, 400, "Bomberman", FLAG_WINDOW_RESIZABLE);
-//		wal.addSystem<RenderSystem>(window);
+		wal.addSystem<AnimationsSystem>()
+			.addSystem<RenderSystem>(window);
 	}
 
-	std::shared_ptr<WAL::Scene> loadGameScene(WAL::Wal &wal)
+	std::shared_ptr<WAL::Scene> loadGameScene()
 	{
 		auto scene = std::make_shared<WAL::Scene>();
 		scene->addEntity("player")
@@ -99,7 +94,7 @@ namespace BBM
 		WAL::Wal wal;
 		addSystems(wal);
 		enableRaylib(wal);
-		wal.scene = loadGameScene(wal);
+		wal.scene = loadGameScene();
 
 		try {
 			wal.run<GameState>(updateState);
diff --git a/sources/System/Animation/AnimationsSystem.cpp b/sources/System/Animation/AnimationsSystem.cpp
index afc22e31..5aaa4597 100644
--- a/sources/System/Animation/AnimationsSystem.cpp
+++ b/sources/System/Animation/AnimationsSystem.cpp
@@ -15,10 +15,10 @@ namespace BBM
 		: System(wal)
 	{}
 
-	void AnimationsSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds)
+	void AnimationsSystem::onUpdate(WAL::ViewEntity<Drawable3DComponent, AnimationsComponent> &entity, std::chrono::nanoseconds)
 	{
-		auto &model = entity.getComponent<Drawable3DComponent>();
-		auto &anim = entity.getComponent<AnimationsComponent>();
+		auto &model = entity.get<Drawable3DComponent>();
+		auto &anim = entity.get<AnimationsComponent>();
 
 		if (anim.isDisabled())
 			return;
diff --git a/sources/System/Animation/AnimationsSystem.hpp b/sources/System/Animation/AnimationsSystem.hpp
index b17b1935..6ace28d8 100644
--- a/sources/System/Animation/AnimationsSystem.hpp
+++ b/sources/System/Animation/AnimationsSystem.hpp
@@ -14,7 +14,7 @@ namespace BBM
 	{
 	public:
 		//! @inherit
-		void onUpdate(WAL::Entity &entity, std::chrono::nanoseconds) override;
+		void onUpdate(WAL::ViewEntity<Drawable3DComponent, AnimationsComponent> &entity, std::chrono::nanoseconds) override;
 
 		//! @brief A default constructor
 		explicit AnimationsSystem(WAL::Wal &wal);
diff --git a/sources/System/Collision/CollisionSystem.cpp b/sources/System/Collision/CollisionSystem.cpp
index 79351729..4e992bda 100644
--- a/sources/System/Collision/CollisionSystem.cpp
+++ b/sources/System/Collision/CollisionSystem.cpp
@@ -28,8 +28,8 @@ namespace BBM
 		auto &posA = entity.get<PositionComponent>();
 		auto &col = entity.get<CollisionComponent>();
 		Vector3f position = posA.position;
-//		if (entity.hasComponent(typeid(MovableComponent)))
-//			position += entity.getComponent<MovableComponent>().getVelocity();
+		if (auto *movable = entity->tryGetComponent<MovableComponent>())
+			position += movable->getVelocity();
 		Vector3f minA = Vector3f::min(position, position + col.bound);
 		Vector3f maxA = Vector3f::max(position, position + col.bound);
 		for (auto other : this->getView()) {
diff --git a/sources/System/Controllable/ControllableSystem.cpp b/sources/System/Controllable/ControllableSystem.cpp
index b028a2c7..f14c46b3 100644
--- a/sources/System/Controllable/ControllableSystem.cpp
+++ b/sources/System/Controllable/ControllableSystem.cpp
@@ -14,10 +14,10 @@ namespace BBM
 		: System(wal)
 	{}
 
-	void ControllableSystem::onFixedUpdate(WAL::Entity &entity)
+	void ControllableSystem::onFixedUpdate(WAL::ViewEntity<ControllableComponent, MovableComponent> &entity)
 	{
-		auto &controllable = entity.getComponent<ControllableComponent>();
-		auto &movable = entity.getComponent<MovableComponent>();
+		auto &controllable = entity.get<ControllableComponent>();
+		auto &movable = entity.get<MovableComponent>();
 		Vector2f move = controllable.move.normalized() * ControllableSystem::speed;
 
 		movable.addForce(Vector3f(move.x, controllable.jump, move.y));
diff --git a/sources/System/Controllable/ControllableSystem.hpp b/sources/System/Controllable/ControllableSystem.hpp
index 042b17df..25a9e837 100644
--- a/sources/System/Controllable/ControllableSystem.hpp
+++ b/sources/System/Controllable/ControllableSystem.hpp
@@ -19,7 +19,7 @@ namespace BBM
 		static constexpr const float speed = .25f;
 
 		//! @inherit
-		void onFixedUpdate(WAL::Entity &entity) override;
+		void onFixedUpdate(WAL::ViewEntity<ControllableComponent, MovableComponent> &entity) override;
 
 		//! @brief A default constructor
 		explicit ControllableSystem(WAL::Wal &wal);
diff --git a/sources/System/Gamepad/GamepadSystem.cpp b/sources/System/Gamepad/GamepadSystem.cpp
index 9392dc02..f6d67d99 100644
--- a/sources/System/Gamepad/GamepadSystem.cpp
+++ b/sources/System/Gamepad/GamepadSystem.cpp
@@ -17,10 +17,10 @@ namespace BBM
 		: System(wal)
 	{}
 
-	void GamepadSystem::onFixedUpdate(WAL::Entity &entity)
+	void GamepadSystem::onFixedUpdate(WAL::ViewEntity<GamepadComponent, ControllableComponent> &entity)
 	{
-		const auto &gamepadComponent = entity.getComponent<GamepadComponent>();
-		auto &controllable = entity.getComponent<ControllableComponent>();
+		const auto &gamepadComponent = entity.get<GamepadComponent>();
+		auto &controllable = entity.get<ControllableComponent>();
 		Gamepad gamepad(gamepadComponent.getID());
 
 		const std::map<Button, bool &> keyPressedMap = {
diff --git a/sources/System/Gamepad/GamepadSystem.hpp b/sources/System/Gamepad/GamepadSystem.hpp
index 8daa5e06..61efdd5e 100644
--- a/sources/System/Gamepad/GamepadSystem.hpp
+++ b/sources/System/Gamepad/GamepadSystem.hpp
@@ -16,7 +16,7 @@ namespace BBM
 	{
 	public:
 		//! @inherit
-		void onFixedUpdate(WAL::Entity &entity) override;
+		void onFixedUpdate(WAL::ViewEntity<GamepadComponent, ControllableComponent> &entity) override;
 
 		//! @brief A default constructor
 		explicit GamepadSystem(WAL::Wal &wal);
diff --git a/sources/System/GridCentered/GridCenteredSystem.cpp b/sources/System/GridCentered/GridCenteredSystem.cpp
index d6337c3a..3c86175b 100644
--- a/sources/System/GridCentered/GridCenteredSystem.cpp
+++ b/sources/System/GridCentered/GridCenteredSystem.cpp
@@ -12,10 +12,10 @@ namespace BBM
 		: System(wal)
 	{}
 
-	void GridCenteredSystem::onFixedUpdate(WAL::Entity &entity)
+	void GridCenteredSystem::onFixedUpdate(WAL::ViewEntity<GridCenteredComponent, MovableComponent, PositionComponent> &entity)
 	{
-		auto &grid = entity.getComponent<GridCenteredComponent>();
-		auto &movement = entity.getComponent<MovableComponent>();
+		auto &grid = entity.get<GridCenteredComponent>();
+		auto &movement = entity.get<MovableComponent>();
 //		movement.addForce(grid.force * )
 	}
 }
\ No newline at end of file
diff --git a/sources/System/GridCentered/GridCenteredSystem.hpp b/sources/System/GridCentered/GridCenteredSystem.hpp
index 3af49ea1..6ab97339 100644
--- a/sources/System/GridCentered/GridCenteredSystem.hpp
+++ b/sources/System/GridCentered/GridCenteredSystem.hpp
@@ -13,7 +13,7 @@ namespace BBM
 	class GridCenteredSystem : public WAL::System<GridCenteredComponent, MovableComponent, PositionComponent>
 	{
 	public:
-		void onFixedUpdate(WAL::Entity &entity) override;
+		void onFixedUpdate(WAL::ViewEntity<GridCenteredComponent, MovableComponent, PositionComponent> &entity) override;
 
 		//! @brief A default constructor
 		explicit GridCenteredSystem(WAL::Wal &wal);
diff --git a/sources/System/Health/HealthSystem.cpp b/sources/System/Health/HealthSystem.cpp
index e9aaa155..29e0db1f 100644
--- a/sources/System/Health/HealthSystem.cpp
+++ b/sources/System/Health/HealthSystem.cpp
@@ -14,9 +14,9 @@ namespace BBM
 		: System(wal)
 	{}
 
-	void HealthSystem::onFixedUpdate(WAL::Entity &entity)
+	void HealthSystem::onFixedUpdate(WAL::ViewEntity<HealthComponent> &entity)
 	{
-		auto &health = entity.getComponent<HealthComponent>();
+		auto &health = entity.get<HealthComponent>();
 
 		if (health.getHealthPoint() == 0)
 			health.onDeath(entity);
diff --git a/sources/System/Health/HealthSystem.hpp b/sources/System/Health/HealthSystem.hpp
index fe8bb1ab..f1cd2397 100644
--- a/sources/System/Health/HealthSystem.hpp
+++ b/sources/System/Health/HealthSystem.hpp
@@ -15,7 +15,7 @@ namespace BBM
 	{
 	public:
 		//! @inherit
-		void onFixedUpdate(WAL::Entity &entity) override;
+		void onFixedUpdate(WAL::ViewEntity<HealthComponent> &entity) override;
 
 		//! @brief A default constructor
 		explicit HealthSystem(WAL::Wal &wal);
diff --git a/sources/System/Keyboard/KeyboardSystem.cpp b/sources/System/Keyboard/KeyboardSystem.cpp
index 044373b4..ccc207ab 100644
--- a/sources/System/Keyboard/KeyboardSystem.cpp
+++ b/sources/System/Keyboard/KeyboardSystem.cpp
@@ -3,11 +3,9 @@
 // Edited by Benjamin Henry on 2021-05-20.
 //
 
-#include <iostream>
 #include "KeyboardSystem.hpp"
 #include "Component/Keyboard/KeyboardComponent.hpp"
 #include "Component/Controllable/ControllableComponent.hpp"
-#include "Entity/Entity.hpp"
 #include "Controllers/Keyboard.hpp"
 
 using Keyboard = RAY::Controller::Keyboard;
@@ -18,10 +16,10 @@ namespace BBM
 		: System(wal)
 	{}
 
-	void KeyboardSystem::onFixedUpdate(WAL::Entity &entity)
+	void KeyboardSystem::onFixedUpdate(WAL::ViewEntity<KeyboardComponent, ControllableComponent> &entity)
 	{
-		const auto &keyboard = entity.getComponent<KeyboardComponent>();
-		auto &controllable = entity.getComponent<ControllableComponent>();
+		const auto &keyboard = entity.get<KeyboardComponent>();
+		auto &controllable = entity.get<ControllableComponent>();
 
 		const std::map<KeyboardKey, bool &> keyPressedMap = {
 			{keyboard.keyJump, controllable.jump},
diff --git a/sources/System/Keyboard/KeyboardSystem.hpp b/sources/System/Keyboard/KeyboardSystem.hpp
index 56977386..cf7309e1 100644
--- a/sources/System/Keyboard/KeyboardSystem.hpp
+++ b/sources/System/Keyboard/KeyboardSystem.hpp
@@ -17,7 +17,7 @@ namespace BBM
 	{
 	public:
 		//! @inherit
-		void onFixedUpdate(WAL::Entity &entity) override;
+		void onFixedUpdate(WAL::ViewEntity<KeyboardComponent, ControllableComponent> &entity) override;
 
 		//! @brief A default constructor
 		explicit KeyboardSystem(WAL::Wal &wal);
diff --git a/sources/System/Movable/MovableSystem.cpp b/sources/System/Movable/MovableSystem.cpp
index c6d86457..eff5a79a 100644
--- a/sources/System/Movable/MovableSystem.cpp
+++ b/sources/System/Movable/MovableSystem.cpp
@@ -12,10 +12,10 @@ namespace BBM
 		: System(wal)
 	{}
 
-	void MovableSystem::onFixedUpdate(WAL::Entity &entity)
+	void MovableSystem::onFixedUpdate(WAL::ViewEntity<MovableComponent, PositionComponent> &entity)
 	{
-		auto &movable = entity.getComponent<MovableComponent>();
-		auto &position = entity.getComponent<PositionComponent>();
+		auto &movable = entity.get<MovableComponent>();
+		auto &position = entity.get<PositionComponent>();
 
 		position.position += movable._velocity;
 		movable._velocity = movable._acceleration;
diff --git a/sources/System/Movable/MovableSystem.hpp b/sources/System/Movable/MovableSystem.hpp
index 7032d97e..e109da13 100644
--- a/sources/System/Movable/MovableSystem.hpp
+++ b/sources/System/Movable/MovableSystem.hpp
@@ -17,7 +17,7 @@ namespace BBM
 	{
 	public:
 		//! @inherit
-		void onFixedUpdate(WAL::Entity &entity) override;
+		void onFixedUpdate(WAL::ViewEntity<MovableComponent, PositionComponent> &entity) override;
 
 		//! @brief A default constructor
 		explicit MovableSystem(WAL::Wal &wal);
diff --git a/sources/System/Renderer/RenderSystem.cpp b/sources/System/Renderer/RenderSystem.cpp
index 16190445..1607183e 100644
--- a/sources/System/Renderer/RenderSystem.cpp
+++ b/sources/System/Renderer/RenderSystem.cpp
@@ -52,10 +52,10 @@ namespace BBM
 		this->_window.endDrawing();
 	}
 
-	void RenderSystem::onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime)
+	void RenderSystem::onUpdate(WAL::ViewEntity<CameraComponent, PositionComponent> &entity, std::chrono::nanoseconds dtime)
 	{
-		const auto &pos = entity.getComponent<PositionComponent>();
-		const auto &cam = entity.getComponent<CameraComponent>();
+		const auto &pos = entity.get<PositionComponent>();
+		const auto &cam = entity.get<CameraComponent>();
 		_camera.setPosition(pos.position);
 		_camera.setTarget(cam.target);
 	}
diff --git a/sources/System/Renderer/RenderSystem.hpp b/sources/System/Renderer/RenderSystem.hpp
index 0ba6c4d3..9c5c4c27 100644
--- a/sources/System/Renderer/RenderSystem.hpp
+++ b/sources/System/Renderer/RenderSystem.hpp
@@ -27,7 +27,7 @@ namespace BBM
 		void onSelfUpdate() override;
 
 		//! @inherit
-		void onUpdate(WAL::Entity &entity, std::chrono::nanoseconds dtime) override;
+		void onUpdate(WAL::ViewEntity<CameraComponent, PositionComponent> &entity, std::chrono::nanoseconds dtime) override;
 
 		//! @brief ctor
 		RenderSystem(WAL::Wal &wal, RAY::Window &window);
diff --git a/tests/CollisionTest.cpp b/tests/CollisionTest.cpp
index 77188df1..ce153238 100644
--- a/tests/CollisionTest.cpp
+++ b/tests/CollisionTest.cpp
@@ -39,8 +39,8 @@ TEST_CASE("Collision test", "[Component][System]")
 	entity.getComponent<CollisionComponent>().bound.y = 5;
 	entity.getComponent<CollisionComponent>().bound.z = 5;
 
-	collision.onUpdate(entity, std::chrono::nanoseconds(1));
-	collision.onFixedUpdate(entity);
+	collision.update(std::chrono::nanoseconds(1));
+	collision.fixedUpdate();
 	REQUIRE(entity.getComponent<PositionComponent>().position.x == 0.0);
 	REQUIRE(entity.getComponent<PositionComponent>().position.y == 0.0);
 	REQUIRE(entity.getComponent<PositionComponent>().position.z == 0.0);
@@ -49,9 +49,9 @@ TEST_CASE("Collision test", "[Component][System]")
 		.addComponent<PositionComponent>(2,2,2)
 		.addComponent<CollisionComponent>(1);
 	Entity &player = wal.scene->getEntities().front();
-	collision.onUpdate(entity, std::chrono::nanoseconds(1));
+	collision.update(std::chrono::nanoseconds(1));
 	REQUIRE(player.hasComponent(typeid(PositionComponent)));
-	collision.onFixedUpdate(player);
+	collision.fixedUpdate();
 	REQUIRE(wal.scene->getEntities().size() == 2);
 	REQUIRE(player.hasComponent(typeid(PositionComponent)));
 	REQUIRE(player.getComponent<PositionComponent>().position.x == 1.0);
@@ -87,10 +87,10 @@ TEST_CASE("Collsion test with movable", "[Component][System]")
 	entity.getComponent<CollisionComponent>().bound.z = 5;
 
 	entity.getComponent<MovableComponent>().addForce({1, 1, 1});
-	collision.onUpdate(entity, std::chrono::nanoseconds(1));
-	collision.onFixedUpdate(entity);
-	movable.onUpdate(entity, std::chrono::nanoseconds(1));
-	movable.onFixedUpdate(entity);
+	collision.update(std::chrono::nanoseconds(1));
+	collision.fixedUpdate();
+	movable.update(std::chrono::nanoseconds(1));
+	movable.fixedUpdate();
 	REQUIRE(entity.getComponent<PositionComponent>().position.x == 0.0);
 	REQUIRE(entity.getComponent<PositionComponent>().position.y == 0.0);
 	REQUIRE(entity.getComponent<PositionComponent>().position.z == 0.0);
diff --git a/tests/MoveTests.cpp b/tests/MoveTests.cpp
index ac035c86..b19a68fc 100644
--- a/tests/MoveTests.cpp
+++ b/tests/MoveTests.cpp
@@ -20,32 +20,32 @@ using namespace BBM;
 TEST_CASE("Move test", "[Component][System]")
 {
 	Wal wal;
-	Scene scene;
-	scene.addEntity("player")
+	wal.scene = std::make_shared<Scene>();
+	wal.scene->addEntity("player")
 		.addComponent<ControllableComponent>()
 		.addComponent<MovableComponent>()
 		.addComponent<PositionComponent>();
-	Entity &entity = *scene.getEntities().begin();
+	Entity &entity = wal.scene->getEntities().front();
 
 	REQUIRE(entity.getComponent<PositionComponent>().position == Vector3f());
 
 	entity.getComponent<ControllableComponent>().move = Vector2f(1, 1);
 
 	ControllableSystem controllable(wal);
-	controllable.onUpdate(entity, std::chrono::nanoseconds(1));
-	controllable.onFixedUpdate(entity);
+	controllable.update(std::chrono::nanoseconds(1));
+	controllable.fixedUpdate();
 	REQUIRE(entity.getComponent<MovableComponent>()._acceleration.x > 0);
 	REQUIRE(entity.getComponent<MovableComponent>()._acceleration.z > 0);
 
 	MovableSystem movable(wal);
-	movable.onUpdate(entity, std::chrono::nanoseconds(1));
-	movable.onFixedUpdate(entity);
+	movable.update(std::chrono::nanoseconds(1));
+	movable.fixedUpdate();
 	REQUIRE(entity.getComponent<MovableComponent>()._velocity.x > 0);
 	REQUIRE(entity.getComponent<MovableComponent>()._velocity.z > 0);
 	REQUIRE(entity.getComponent<MovableComponent>()._acceleration.x == 0);
 	REQUIRE(entity.getComponent<MovableComponent>()._acceleration.z == 0);
-	movable.onUpdate(entity, std::chrono::nanoseconds(1));
-	movable.onFixedUpdate(entity);
+	movable.update(std::chrono::nanoseconds(1));
+	movable.fixedUpdate();
 	REQUIRE(entity.getComponent<PositionComponent>().position.x > 0);
 	REQUIRE(entity.getComponent<PositionComponent>().position.z > 0);
 
diff --git a/tests/ViewTest.cpp b/tests/ViewTest.cpp
index 194e04a6..569d42ad 100644
--- a/tests/ViewTest.cpp
+++ b/tests/ViewTest.cpp
@@ -22,7 +22,7 @@ TEST_CASE("View creation", "[View]")
 	REQUIRE(scene.view<PositionComponent>().size() == 2);
 	REQUIRE(scene.view<PositionComponent, ControllableComponent>().size() == 1);
 	Entity &entity = *scene.getEntities().begin();
-	Entity &firstView = *scene.view<PositionComponent, ControllableComponent>().entities.begin();
+	Entity &firstView = scene.view<PositionComponent, ControllableComponent>().front();
 	REQUIRE(&entity == &firstView);
 }
 
@@ -62,23 +62,65 @@ TEST_CASE("View cache switch", "[View]")
 		.addComponent<PositionComponent>();
 
 	REQUIRE(&view == &scene.view<PositionComponent>());
-	REQUIRE(view.entities.begin()->get().getName() == "player");
-	REQUIRE(scene2.view<PositionComponent>().entities.begin()->get().getName() == "box");
+	REQUIRE(view.front()->getName() == "player");
+	REQUIRE(scene2.view<PositionComponent>().front()->getName() == "box");
 }
 
-//TEST_CASE("View iteration", "[View]")
-//{
-//	Scene scene;
-//	scene.addEntity("player")
-//		.addComponent<PositionComponent>()
-//		.addComponent<ControllableComponent>();
-//	scene.addEntity("Box")
-//		.addComponent<PositionComponent>();
-//	int i = 0;
-//	for (auto &entity : scene.view<PositionComponent>()) {
-//		if (i == 0)
-//			REQUIRE(entity.getName() == "player");
-//		else
-//			REQUIRE(entity.getName() == "Box");
-//	}
-//}
\ No newline at end of file
+TEST_CASE("View entity iteration", "[View]")
+{
+	Scene scene;
+	scene.addEntity("player")
+		.addComponent<PositionComponent>()
+		.addComponent<ControllableComponent>();
+	scene.addEntity("Box")
+		.addComponent<PositionComponent>();
+	int i = 0;
+	for (Entity &entity : scene.view<PositionComponent>()) {
+		if (i == 0)
+			REQUIRE(entity.getName() == "player");
+		else
+			REQUIRE(entity.getName() == "Box");
+		i++;
+	}
+	REQUIRE(i == 2);
+}
+
+TEST_CASE("ViewEntity<> iteration", "[View]")
+{
+	Scene scene;
+	scene.addEntity("player")
+		.addComponent<PositionComponent>(1, 1, 1)
+		.addComponent<ControllableComponent>();
+	scene.addEntity("Box")
+		.addComponent<PositionComponent>(1, 1, 1);
+	int i = 0;
+	for (auto entity : scene.view<PositionComponent>()) {
+		if (i == 0)
+			REQUIRE(entity->getName() == "player");
+		else
+			REQUIRE(entity->getName() == "Box");
+		REQUIRE(entity.get<PositionComponent>().position == Vector3f(1, 1, 1));
+		i++;
+	}
+	REQUIRE(i == 2);
+}
+
+TEST_CASE("View [entity, component] iteration", "[View]")
+{
+	Scene scene;
+	scene.addEntity("player")
+		.addComponent<PositionComponent>(1, 1, 1)
+		.addComponent<ControllableComponent>();
+	scene.addEntity("Box")
+		.addComponent<PositionComponent>(1, 1, 1);
+	int i = 0;
+	for (auto &[entity, position] : scene.view<PositionComponent>()) {
+		if (i == 0)
+			REQUIRE(entity.getName() == "player");
+		else
+			REQUIRE(entity.getName() == "Box");
+		REQUIRE(position.position == Vector3f(1, 1, 1));
+		i++;
+	}
+	REQUIRE(i == 2);
+}
\ No newline at end of file