Adding support for easy_maps
merges