Map generators changed to package