Added missing getters on the map
Fixed method baseLayer implementation