Moved maps to end