Modified the map for easier acess