Refactoring map components