Updated to use new maps api