Refactored MapItem

Refactored MapItem