Added new map + automatic entity generator