Added better map structure.