diff --git a/SharedData/SharedData.c b/SharedData/SharedData.c
index 9ce9d95..736bdb1 100644
--- a/SharedData/SharedData.c
+++ b/SharedData/SharedData.c
@@ -4,7 +4,13 @@
 
 #include "SharedData.h"
 
-SETTER(SharedData, Building *, main_building)
+GETTER(SharedData, Building *, main_building)
+GETTER(SharedData, CommunicationBox *, box)
+
+void set_main_building_SharedData(THIS(SharedData), Building * building){
+	this->main_building = building;
+	this->box = (building != NULL ) ? building->box : NULL;
+}
 
 void wait_threads_SharedData(THIS(SharedData)){
 	int i;
@@ -44,11 +50,14 @@ SharedData *_get_instance_SharedData(){
 
 		new_shared_data->threads = NULL;
 		new_shared_data->main_building = NULL; /* Should be set to NULL if freed */
+		new_shared_data->box = NULL; /* freed inside main_building */
 		new_shared_data->threads_nb = 0;
 
 		LINK_ALL(SharedData, new_shared_data,
 				 wait_threads,
 				 set_main_building,
+				 get_main_building,
+				 get_box,
 				 call_elevator
 		);
 	}
diff --git a/SharedData/SharedData.h b/SharedData/SharedData.h
index 1f2d6bf..0cb96e5 100644
--- a/SharedData/SharedData.h
+++ b/SharedData/SharedData.h
@@ -17,9 +17,13 @@ typedef struct o_SharedData {
 	PRIVATE int threads_nb;
 	PRIVATE pthread_t *threads;
 	PRIVATE pthread_mutex_t mutex_array[MUTEX_NB];
+
 	PRIVATE Building * main_building;
+	PRIVATE CommunicationBox * box;
 
 	PUBLIC void (*set_main_building)(_THIS(SharedData), Building * building);
+	PUBLIC Building * (*get_main_building)(_THIS(SharedData));
+	PUBLIC CommunicationBox * (*get_box)(_THIS(SharedData));
 	PUBLIC void (*wait_threads)(_THIS(SharedData));
 	PUBLIC int (*call_elevator)(_THIS(SharedData), int starting_floor, int destination_floor);