Map creation extracted to own module.