Changed building support from MapBuilding to MapObject