Updated FloorPlan with Constructor