Experimenting with new map structure