Added basic support for Maps API