Fix imports
Improve GoogleMapMixin