Updated Maps Functionality