Added features for Maps and Gallery