Updates to BuildingController