Added map and world