6 files changed, 51 insertions, 30 deletions
diff --git a/src/interfaces/command.hpp b/src/interfaces/command.hpp
index 245bdd6..62d7a59 100644
--- a/src/interfaces/command.hpp
+++ b/src/interfaces/command.hpp
@@ -1,9 +1,18 @@
 #pragma once
 
-class ICommand
+#include "interfaces/subscriber.hpp"
+
+#include <cstddef>
+
+class ICommand : public ISubscriber<std::nullptr_t>
 {
 public:
 	virtual ~ICommand() = default;
 
 	virtual void execute() noexcept = 0;
+
+	void update(const std::nullptr_t & /*context*/) noexcept override
+	{
+		execute();
+	};
 };
diff --git a/src/interfaces/engine.hpp b/src/interfaces/engine.hpp
index 498ff41..6830340 100644
--- a/src/interfaces/engine.hpp
+++ b/src/interfaces/engine.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "interfaces/observable.hpp"
-
 #include <unordered_map>
 
 class ICLIGameEngine
diff --git a/src/interfaces/input.hpp b/src/interfaces/input.hpp
index 82ad57c..795ade2 100644
--- a/src/interfaces/input.hpp
+++ b/src/interfaces/input.hpp
@@ -1,21 +1,27 @@
 #pragma once
 
-#include "interfaces/command.hpp"
-#include "interfaces/observable.hpp"
+#include "interfaces/publisher.hpp"
+#include "interfaces/subscriber.hpp"
 
+#include <cstddef>
 #include <memory>
 
-class IInputHandler : public IObservable<char>
+class IInputHandler : public IPublisher<char, std::nullptr_t>
 {
 public:
+	using Event = char;
+	using Context = std::nullptr_t;
+
 	~IInputHandler() noexcept override = default;
 
-	void listen() const noexcept override = 0;
+	virtual void listen() const noexcept = 0;
 
-	void attach(const char &key,
-				const std::shared_ptr<ICommand> &command) noexcept override = 0;
+	void subscribe(
+		const Event &event,
+		const std::shared_ptr<ISubscriber<Context>> &subscriber) noexcept override = 0;
 
-	void notify(const char &key) const noexcept override = 0;
+	void notify_subscribers(const Event &event,
+							const Context &context) const noexcept override = 0;
 
 	virtual void enter_raw_mode() noexcept = 0;
 
diff --git a/src/interfaces/observable.hpp b/src/interfaces/observable.hpp
deleted file mode 100644
index 21fed76..0000000
--- a/src/interfaces/observable.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "interfaces/command.hpp"
-
-#include <functional>
-#include <memory>
-
-template <typename Event>
-class IObservable
-{
-public:
-	virtual ~IObservable() noexcept = default;
-
-	virtual void listen() const noexcept = 0;
-
-	virtual void attach(const char &event,
-						const std::shared_ptr<ICommand> &command) noexcept = 0;
-
-	virtual void notify(const Event &event) const noexcept = 0;
-};
diff --git a/src/interfaces/publisher.hpp b/src/interfaces/publisher.hpp
new file mode 100644
index 0000000..14766ed
--- /dev/null
+++ b/src/interfaces/publisher.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "interfaces/subscriber.hpp"
+
+#include <functional>
+#include <memory>
+
+template <typename Event, typename Context>
+class IPublisher
+{
+public:
+	virtual ~IPublisher() noexcept = default;
+
+	virtual void
+	subscribe(const Event &event,
+			  const std::shared_ptr<ISubscriber<Context>> &subscriber) noexcept = 0;
+
+	virtual void notify_subscribers(const Event &event,
+									const Context &context) const noexcept = 0;
+};
diff --git a/src/interfaces/subscriber.hpp b/src/interfaces/subscriber.hpp
new file mode 100644
index 0000000..17d87ef
--- /dev/null
+++ b/src/interfaces/subscriber.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+template <typename Context>
+class ISubscriber
+{
+public:
+	virtual void update(const Context &context) noexcept = 0;
+};