Improved map structure