Updated to use google maps API