Some map structure changes