Updates to google map logic