Added functionality to MapModel