Changes for handling map objects