Added map and map configuration