Added more refactoring to use different mapIds for different floors