diff --git a/inc/Services/EventReportService.hpp b/inc/Services/EventReportService.hpp
index 3b2c2bdd82502d57fb964a3a3ff7a10a686b524e..5d17779bf78e0bfa7a59437688e3de938db81ed3 100644
--- a/inc/Services/EventReportService.hpp
+++ b/inc/Services/EventReportService.hpp
@@ -2,7 +2,6 @@
 #define ECSS_SERVICES_EVENTREPORTSERVICE_HPP
 
 #include "Service.hpp"
-#include <Services/EventActionService.hpp> // Not sure if this is needed here or just in .cpp file
 #include <bitset>
 /**
  * Implementation of ST[05] event reporting service
diff --git a/src/main.cpp b/src/main.cpp
index 1adbf2abcea65d5a2be001cfd456a2f2e440cd57..bc6fcc911e3b2f95cb29861c14fde59f7affcb05 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -7,6 +7,7 @@
 #include "Services/MemoryManagementService.hpp"
 #include "Services/EventReportService.hpp"
 #include "Services/TimeManagementService.hpp"
+#include "Services/EventActionService.hpp"
 #include "Message.hpp"
 #include "MessageParser.hpp"
 #include "Services/MemoryManagementService.hpp"
@@ -230,8 +231,9 @@ int main() {
 
 	eventActionService.disableEventActionDefinitions(eventActionDefinition3);
 	std::cout << "Status of position 0,1,2 should be 000:" << eventActionService
-		.stateOfEventAction[0] << eventActionService.stateOfEventAction[1] << eventActionService
-		          .stateOfEventAction[2];
+		.eventActionDefinitionArray[0].enabled << eventActionService
+		.eventActionDefinitionArray[1].enabled <<
+		eventActionService.eventActionDefinitionArray[2].enabled;
 
 	Message eventActionDefinition5(19, 4, Message::TC, 1);
 	eventActionDefinition5.appendUint16(2);
@@ -241,8 +243,9 @@ int main() {
 	eventActionDefinition5.appendUint16(3);
 	eventActionService.enableEventActionDefinitions(eventActionDefinition5);
 	std::cout << "\nStatus of position 0,1,2 should be 111:" << eventActionService
-		.stateOfEventAction[0] << eventActionService.stateOfEventAction[1] << eventActionService
-		          .stateOfEventAction[2];
+		.eventActionDefinitionArray[0].enabled << eventActionService
+		.eventActionDefinitionArray[1].enabled <<
+		eventActionService.eventActionDefinitionArray[2].enabled;
 
 	Message eventActionDefinition4(19, 2, Message::TC, 1);
 	eventActionDefinition4.appendUint16(1);