Moved maps to partials