Modifications to Map and Tile