Added map and layers