Working on new map structure