Changes for FloorPlan, getting rid of CoordinateObject