Use enums when generating map and create the new hex objects