Updated BuildingListener and RoomListener