Added map structure