diff --git a/source/shoh/src/threads/manager/Manager.cpp b/source/shoh/src/threads/manager/Manager.cpp
index fafac81..507a9a6 100644
--- a/source/shoh/src/threads/manager/Manager.cpp
+++ b/source/shoh/src/threads/manager/Manager.cpp
@@ -20,33 +20,13 @@ Manager::~Manager()
 	LOG_ERROR("Deleting Manager");
 }
 
-Event::EventPair Manager::parseEvent(Event* e)
-{
-	EventRawData raw_data;
-	for(Event::EventType i :
-	    {Event::Rotary, Event::InternalTemp,
-		 Event::ExternalTemp})
-	{
-		raw_data = e->getDataOf(i);
-		if(raw_data != ERROR_RETURN)
-		{
-			Event::EventPair p = {raw_data, i};
-			return p; 
-		}
-	}
-	LOG_WARNING("Event is empty");
-	return {ERROR_RETURN, Event::Null};
-}
-
 void Manager::taskFunction()
 {
 	Event data(Event::Null, 0);
-	Event::EventPair event_pair = {0, Event::EventType::Null};
 	for(;;)
 	{
 		_qm->receive<Event>(ThreadCommon::QueueManager::manager_event_master, &data, portMAX_DELAY);
-		event_pair= this->parseEvent(&data);
-        _menu.HandleEventPair(&event_pair);
+        _menu.HandleEventPair(&data);
 	}
 }
 
diff --git a/source/shoh/src/threads/manager/Manager.h b/source/shoh/src/threads/manager/Manager.h
index 7a8e844..23e2c99 100644
--- a/source/shoh/src/threads/manager/Manager.h
+++ b/source/shoh/src/threads/manager/Manager.h
@@ -20,7 +20,6 @@ public:
 	virtual ~Manager();
 	void taskFunction();
 private:
-	Event::EventPair parseEvent(Event* e);
 	ThreadCommon::QueueManager* _qm;
 	Menu _menu;
 
diff --git a/source/shoh/src/threads/manager/Menu.cpp b/source/shoh/src/threads/manager/Menu.cpp
index 19d8593..cd31c4d 100644
--- a/source/shoh/src/threads/manager/Menu.cpp
+++ b/source/shoh/src/threads/manager/Menu.cpp
@@ -38,14 +38,14 @@ Menu::readSetPointFromEEPROM (void)
     }
 }
 
-void Menu::HandleEventPair (Event::EventPair *ep)
+void Menu::HandleEventPair (Event *ep)
 {
-    switch(ep->et/*EventType*/)
+    switch(ep->getType()/*EventType*/)
     {
         case Event::Rotary:
             // can be wrapped in a function, but this was found to be more clear solution,
             // since we are still handling eventpair here, although nested
-            switch(static_cast<ThreadCommon::RotaryAction>(ep->rd)/*RawData*/)
+            switch(static_cast<ThreadCommon::RotaryAction>(ep->getData())/*RawData*/)
             {
                 case ThreadCommon::RotaryAction::Right:
                     this->HandleObj(MenuObjEvent (MenuObjEvent::eRollClockWise));
@@ -68,7 +68,7 @@ void Menu::HandleEventPair (Event::EventPair *ep)
             break;
         case Event::ExternalTemp:
             //Change ExternalTemp value. -99 <= ext_temp <= 99
-            this->ext_temp.setCurrent(ep->rd);
+            this->ext_temp.setCurrent(ep->getData());
             //Refresh the menu screen.
             this->HandleObj(MenuObjEvent (MenuObjEvent::eRefresh));
             break;
@@ -179,7 +179,7 @@ void Menu::sSetPointMod(const MenuObjEvent &e)
         // Write to EEPROM
         eeprom.write_to(EEPROM_START_ADDR, (void*)&sp, sizeof(EventRawData));
 
-        event_sp.setDataOf(Event::EventType::SetPoint, sp);
+        event_sp.setEvent(Event::EventType::SetPoint, sp);
         _qm->send<Event>(ThreadCommon::QueueManager::master_event_all, &event_sp, 1);
         
         this->SetState(&Menu::sMainView);
diff --git a/source/shoh/src/threads/manager/Menu.h b/source/shoh/src/threads/manager/Menu.h
index 76b1a22..e7fdadb 100644
--- a/source/shoh/src/threads/manager/Menu.h
+++ b/source/shoh/src/threads/manager/Menu.h
@@ -22,7 +22,7 @@ class Menu
 public:
   Menu (ThreadCommon::QueueManager* qm);
   virtual ~Menu ();
-  void HandleEventPair (Event::EventPair *ep);
+  void HandleEventPair (Event *ep);
 
 private:
   /* Variables and objects */