Update Building/BuildingHandler class for data storage