Improved generated maps