Updates to support google map