diff --git a/.vscode/settings.json b/.vscode/settings.json
index cfa6e103..87d5206d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -37,7 +37,9 @@
 		"**/packages/social-share": false,
 		"**/packages/theme-switcher": false,
 		"**/packages/twitter": false,
-		"**/packages/zip": false
+		"**/packages/zip": false,
+		"**/packages/google-maps-utils": false,
+		"**/packages/google-mobile-ads": false
 	},
 	"search.exclude": {
 		"**/apps/demo": false,
@@ -77,6 +79,8 @@
 		"**/packages/social-share": false,
 		"**/packages/theme-switcher": false,
 		"**/packages/twitter": false,
-		"**/packages/zip": false
+		"**/packages/zip": false,
+		"**/packages/google-maps-utils": false,
+		"**/packages/google-mobile-ads": false
 	}
 }
diff --git a/apps/demo-angular/src/plugin-demos/google-maps-utils.component.html b/apps/demo-angular/src/plugin-demos/google-maps-utils.component.html
deleted file mode 100644
index 56634035..00000000
--- a/apps/demo-angular/src/plugin-demos/google-maps-utils.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<ActionBar title="google-maps-utils" class="action-bar"> </ActionBar>
-<StackLayout class="p-20">
-  <ScrollView class="h-full">
-    <StackLayout>
-      <Button text="Test google-maps-utils" (tap)="demoShared.testIt()" class="btn btn-primary"></Button>
-    </StackLayout>
-  </ScrollView>
-</StackLayout>
diff --git a/apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts b/apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts
deleted file mode 100644
index 3ae88b2b..00000000
--- a/apps/demo-angular/src/plugin-demos/google-maps-utils.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component, NgZone } from '@angular/core';
-import { DemoSharedGoogleMapsUtils } from '@demo/shared';
-import { } from '@nativescript/google-maps-utils';
-
-@Component({
-	selector: 'demo-google-maps-utils',
-	templateUrl: 'google-maps-utils.component.html',
-})
-export class GoogleMapsUtilsComponent {
-  
-  demoShared: DemoSharedGoogleMapsUtils;
-  
-	constructor(private _ngZone: NgZone) {}
-
-  ngOnInit() {
-    this.demoShared = new DemoSharedGoogleMapsUtils();
-  }
-
-}
\ No newline at end of file
diff --git a/apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts b/apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts
deleted file mode 100644
index 1a219672..00000000
--- a/apps/demo-angular/src/plugin-demos/google-maps-utils.module.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NativeScriptCommonModule, NativeScriptRouterModule } from '@nativescript/angular';
-import { GoogleMapsUtilsComponent } from './google-maps-utils.component';
-
-@NgModule({
-	imports: [NativeScriptCommonModule, NativeScriptRouterModule.forChild([{ path: '', component: GoogleMapsUtilsComponent }])],
-  declarations: [GoogleMapsUtilsComponent],
-  schemas: [ NO_ERRORS_SCHEMA]
-})
-export class GoogleMapsUtilsModule {}
diff --git a/apps/demo/package.json b/apps/demo/package.json
index 17107122..4eba42cb 100644
--- a/apps/demo/package.json
+++ b/apps/demo/package.json
@@ -5,10 +5,8 @@
 	"repository": "<fill-your-repository-here>",
 	"dependencies": {
 		"@nativescript/google-maps": "file:../../packages/google-maps",
-		"@nativescript/google-maps-utils": "file:../../packages/google-maps-utils",
-		"@nativescript/jetpack-compose": "file:../../packages/jetpack-compose",
 		"@nativescript/core": "*",
-		"@nativescript/camera": "file:../../packages/camera",
+		"@nativescript/google-maps-utils": "file:../../packages/google-maps-utils",
 		"@nativescript/animated-circle": "file:../../packages/animated-circle",
 		"@nativescript/appavailability": "file:../../packages/appavailability",
 		"@nativescript/apple-sign-in": "file:../../packages/apple-sign-in",
@@ -16,6 +14,7 @@
 		"@nativescript/background-http": "file:../../packages/background-http",
 		"@nativescript/biometrics": "file:../../packages/biometrics",
 		"@nativescript/brightness": "file:../../packages/brightness",
+		"@nativescript/camera": "file:../../packages/camera",
 		"@nativescript/contacts": "file:../../packages/contacts",
 		"@nativescript/datetimepicker": "file:../../packages/datetimepicker",
 		"@nativescript/debug-android": "file:../../packages/debug-android",
@@ -26,6 +25,7 @@
 		"@nativescript/facebook": "file:../../packages/facebook",
 		"@nativescript/fingerprint-auth": "file:../../packages/fingerprint-auth",
 		"@nativescript/geolocation": "file:../../packages/geolocation",
+		"@nativescript/google-mobile-ads": "file:../../packages/google-mobile-ads",
 		"@nativescript/google-signin": "file:../../packages/google-signin",
 		"@nativescript/haptics": "file:../../packages/haptics",
 		"@nativescript/imagepicker": "file:../../packages/imagepicker",
@@ -33,6 +33,7 @@
 		"@nativescript/iqkeyboardmanager": "file:../../packages/iqkeyboardmanager",
 		"@nativescript/keyboard-toolbar": "file:../../packages/keyboard-toolbar",
 		"@nativescript/local-notifications": "file:../../packages/local-notifications",
+		"@nativescript/localize": "file:../../packages/localize",
 		"@nativescript/pdf": "file:../../packages/pdf",
 		"@nativescript/picker": "file:../../packages/picker",
 		"@nativescript/secure-storage": "file:../../packages/secure-storage",
@@ -40,8 +41,7 @@
 		"@nativescript/social-share": "file:../../packages/social-share",
 		"@nativescript/theme-switcher": "file:../../packages/theme-switcher",
 		"@nativescript/twitter": "file:../../packages/twitter",
-		"@nativescript/zip": "file:../../packages/zip",
-		"@nativescript/google-mobile-ads": "file:../../packages/google-mobile-ads"
+		"@nativescript/zip": "file:../../packages/zip"
 	},
 	"devDependencies": {
 		"@nativescript/android": "~8.9.0",
diff --git a/apps/demo/src/plugin-demos/google-maps-utils.xml b/apps/demo/src/plugin-demos/google-maps-utils.xml
index 65a33ef6..0d297ac0 100644
--- a/apps/demo/src/plugin-demos/google-maps-utils.xml
+++ b/apps/demo/src/plugin-demos/google-maps-utils.xml
@@ -3,7 +3,7 @@
         <ActionBar title="google-maps-utils" icon="" class="action-bar">
         </ActionBar>
     </Page.actionBar>
-    <StackLayout class="p-20">
+    <StackLayout class="p-1">
 			<StackLayout>
 				<Button text="Test google-maps-utils" tap="{{ testIt }}" class="btn btn-primary"/>
 				<map:MapView
diff --git a/apps/demo/tsconfig.json b/apps/demo/tsconfig.json
index 69675d5d..0f673b41 100644
--- a/apps/demo/tsconfig.json
+++ b/apps/demo/tsconfig.json
@@ -48,7 +48,9 @@
 			"@nativescript/contacts": ["../../packages/contacts/index.d.ts"],
 			"@nativescript/*": ["../../packages/*"],
 			"@nativescript/google-mobile-ads": ["../../packages/google-mobile-ads/index.d.ts"],
-			"@nativescript/google-mobile-ads/angular": ["../../packages/google-mobile-ads/angular/index.ts"]
+			"@nativescript/google-mobile-ads/angular": ["../../packages/google-mobile-ads/angular/index.ts"],
+			"@nativescript/google-maps-utils": ["../../packages/google-maps-utils/index.d.ts"],
+			"@nativescript/keyboard-toolbar": ["../../packages/keyboard-toolbar/index.d.ts"]
 		}
 	}
 }
diff --git a/packages/google-maps-utils/index.ios.ts b/packages/google-maps-utils/index.ios.ts
index b523a374..b482c0b3 100644
--- a/packages/google-maps-utils/index.ios.ts
+++ b/packages/google-maps-utils/index.ios.ts
@@ -1,6 +1,7 @@
 import { Color, encoding } from '@nativescript/core';
 import { GeoJSON } from 'geojson';
-import { Coordinate, GoogleMap, ITileProvider, MarkerOptions, intoNativeMarkerOptions } from '@nativescript/google-maps';
+import { Coordinate, GoogleMap, ITileProvider, MarkerOptions } from '@nativescript/google-maps';
+import { intoNativeMarkerOptions } from '@nativescript/google-maps/utils';
 import { HeatmapOptions, IClusterManager, IFeature, IGeoJsonLayer, IGeometry, IGeometryStyle, IGradient, IHeatmapTileProvider, intoNativeClusterManager, intoNativeHeatmapGradient, intoNativeHeatmapProvider } from '.';
 import { applyMixins } from './utils/common';
 
diff --git a/packages/google-maps-utils/platforms/ios/Podfile b/packages/google-maps-utils/platforms/ios/Podfile
index beb91951..569a96da 100644
--- a/packages/google-maps-utils/platforms/ios/Podfile
+++ b/packages/google-maps-utils/platforms/ios/Podfile
@@ -1 +1 @@
-pod 'Google-Maps-iOS-Utils', '4.1.0'
+pod 'Google-Maps-iOS-Utils', '6.1.0'
diff --git a/packages/google-maps-utils/project.json b/packages/google-maps-utils/project.json
index 3d7c09e0..fdcfda3c 100644
--- a/packages/google-maps-utils/project.json
+++ b/packages/google-maps-utils/project.json
@@ -22,14 +22,14 @@
 						"input": "packages/google-maps-utils/platforms/",
 						"output": "./platforms/"
 					}
-				],
-				"dependsOn": [
-					{
-						"target": "build.all",
-						"projects": "dependencies"
-					}
 				]
-			}
+			},
+			"dependsOn": [
+				{
+					"target": "build.all",
+					"dependencies": true
+				}
+			]
 		},
 		"build.all": {
 			"executor": "nx:run-commands",
@@ -41,11 +41,10 @@
 			"dependsOn": [
 				{
 					"target": "build.all",
-					"projects": "dependencies"
+					"dependencies": true
 				},
 				{
-					"target": "build",
-					"projects": "self"
+					"target": "build"
 				}
 			]
 		},
@@ -57,11 +56,7 @@
 			}
 		},
 		"lint": {
-			"executor": "@nx/eslint:eslint",
-			"options": {
-				"lintFilePatterns": ["packages/google-maps-utils/**/*.ts"]
-			}
+			"executor": "@nx/eslint:lint"
 		}
-	},
-	"tags": []
+	}
 }
diff --git a/packages/google-maps-utils/typings/objc!GoogleMapsUtils.d.ts b/packages/google-maps-utils/typings/objc!GoogleMapsUtils.d.ts
index 3f0fb782..97143980 100644
--- a/packages/google-maps-utils/typings/objc!GoogleMapsUtils.d.ts
+++ b/packages/google-maps-utils/typings/objc!GoogleMapsUtils.d.ts
@@ -1,6 +1,4 @@
-
 interface GMUCluster extends NSObjectProtocol {
-
 	count: number;
 
 	items: NSArray<GMUClusterItem>;
@@ -8,12 +6,10 @@ interface GMUCluster extends NSObjectProtocol {
 	position: CLLocationCoordinate2D;
 }
 declare var GMUCluster: {
-
 	prototype: GMUCluster;
 };
 
 interface GMUClusterAlgorithm extends NSObjectProtocol {
-
 	addItems(items: NSArray<GMUClusterItem> | GMUClusterItem[]): void;
 
 	clearItems(): void;
@@ -23,21 +19,17 @@ interface GMUClusterAlgorithm extends NSObjectProtocol {
 	removeItem(item: GMUClusterItem): void;
 }
 declare var GMUClusterAlgorithm: {
-
 	prototype: GMUClusterAlgorithm;
 };
 
 interface GMUClusterIconGenerator extends NSObjectProtocol {
-
 	iconForSize(size: number): UIImage;
 }
 declare var GMUClusterIconGenerator: {
-
 	prototype: GMUClusterIconGenerator;
 };
 
 interface GMUClusterItem extends NSObjectProtocol {
-
 	position: CLLocationCoordinate2D;
 
 	snippet?: string;
@@ -45,12 +37,10 @@ interface GMUClusterItem extends NSObjectProtocol {
 	title?: string;
 }
 declare var GMUClusterItem: {
-
 	prototype: GMUClusterItem;
 };
 
 declare class GMUClusterManager extends NSObject implements GMSMapViewDelegate {
-
 	static alloc(): GMUClusterManager; // inherited from NSObject
 
 	static new(): GMUClusterManager; // inherited from NSObject
@@ -71,9 +61,9 @@ declare class GMUClusterManager extends NSObject implements GMSMapViewDelegate {
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { map: GMSMapView; algorithm: GMUClusterAlgorithm; renderer: GMUClusterRenderer; });
+	constructor(o: { map: GMSMapView; algorithm: GMUClusterAlgorithm; renderer: GMUClusterRenderer });
 
 	addItem(item: GMUClusterItem): void;
 
@@ -103,6 +93,8 @@ declare class GMUClusterManager extends NSObject implements GMSMapViewDelegate {
 
 	mapViewDidChangeCameraPosition(mapView: GMSMapView, position: GMSCameraPosition): void;
 
+	mapViewDidChangeMapCapabilities(mapView: GMSMapView, mapCapabilities: GMSMapCapabilityFlags): void;
+
 	mapViewDidCloseInfoWindowOfMarker(mapView: GMSMapView, marker: GMSMarker): void;
 
 	mapViewDidDragMarker(mapView: GMSMapView, marker: GMSMarker): void;
@@ -119,6 +111,8 @@ declare class GMUClusterManager extends NSObject implements GMSMapViewDelegate {
 
 	mapViewDidTapAtCoordinate(mapView: GMSMapView, coordinate: CLLocationCoordinate2D): void;
 
+	mapViewDidTapFeaturesInFeatureLayerAtLocation(mapView: GMSMapView, features: NSArray<GMSFeature> | GMSFeature[], featureLayer: GMSFeatureLayer<any>, location: CLLocationCoordinate2D): void;
+
 	mapViewDidTapInfoWindowOfMarker(mapView: GMSMapView, marker: GMSMarker): void;
 
 	mapViewDidTapMarker(mapView: GMSMapView, marker: GMSMarker): boolean;
@@ -159,29 +153,24 @@ declare class GMUClusterManager extends NSObject implements GMSMapViewDelegate {
 }
 
 interface GMUClusterManagerDelegate extends NSObjectProtocol {
-
 	clusterManagerDidTapCluster?(clusterManager: GMUClusterManager, cluster: GMUCluster): boolean;
 
 	clusterManagerDidTapClusterItem?(clusterManager: GMUClusterManager, clusterItem: GMUClusterItem): boolean;
 }
 declare var GMUClusterManagerDelegate: {
-
 	prototype: GMUClusterManagerDelegate;
 };
 
 interface GMUClusterRenderer extends NSObjectProtocol {
-
 	renderClusters(clusters: NSArray<GMUCluster> | GMUCluster[]): void;
 
 	update(): void;
 }
 declare var GMUClusterRenderer: {
-
 	prototype: GMUClusterRenderer;
 };
 
 interface GMUClusterRendererDelegate extends NSObjectProtocol {
-
 	rendererDidRenderMarker?(renderer: GMUClusterRenderer, marker: GMSMarker): void;
 
 	rendererMarkerForObject?(renderer: GMUClusterRenderer, object: any): GMSMarker;
@@ -189,12 +178,10 @@ interface GMUClusterRendererDelegate extends NSObjectProtocol {
 	rendererWillRenderMarker?(renderer: GMUClusterRenderer, marker: GMSMarker): void;
 }
 declare var GMUClusterRendererDelegate: {
-
 	prototype: GMUClusterRendererDelegate;
 };
 
 declare class GMUDefaultClusterIconGenerator extends NSObject implements GMUClusterIconGenerator {
-
 	static alloc(): GMUDefaultClusterIconGenerator; // inherited from NSObject
 
 	static new(): GMUDefaultClusterIconGenerator; // inherited from NSObject
@@ -209,13 +196,13 @@ declare class GMUDefaultClusterIconGenerator extends NSObject implements GMUClus
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { buckets: NSArray<number> | number[]; });
+	constructor(o: { buckets: NSArray<number> | number[] });
 
-	constructor(o: { buckets: NSArray<number> | number[]; backgroundColors: NSArray<UIColor> | UIColor[]; });
+	constructor(o: { buckets: NSArray<number> | number[]; backgroundColors: NSArray<UIColor> | UIColor[] });
 
-	constructor(o: { buckets: NSArray<number> | number[]; backgroundImages: NSArray<UIImage> | UIImage[]; });
+	constructor(o: { buckets: NSArray<number> | number[]; backgroundImages: NSArray<UIImage> | UIImage[] });
 
 	class(): typeof NSObject;
 
@@ -253,7 +240,6 @@ declare class GMUDefaultClusterIconGenerator extends NSObject implements GMUClus
 }
 
 declare class GMUDefaultClusterRenderer extends NSObject implements GMUClusterRenderer {
-
 	static alloc(): GMUDefaultClusterRenderer; // inherited from NSObject
 
 	static new(): GMUDefaultClusterRenderer; // inherited from NSObject
@@ -282,9 +268,9 @@ declare class GMUDefaultClusterRenderer extends NSObject implements GMUClusterRe
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { mapView: GMSMapView; clusterIconGenerator: GMUClusterIconGenerator; });
+	constructor(o: { mapView: GMSMapView; clusterIconGenerator: GMUClusterIconGenerator });
 
 	class(): typeof NSObject;
 
@@ -322,7 +308,6 @@ declare class GMUDefaultClusterRenderer extends NSObject implements GMUClusterRe
 }
 
 declare class GMUFeature extends NSObject implements GMUGeometryContainer {
-
 	static alloc(): GMUFeature; // inherited from NSObject
 
 	static new(): GMUFeature; // inherited from NSObject
@@ -347,9 +332,9 @@ declare class GMUFeature extends NSObject implements GMUGeometryContainer {
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { geometry: GMUGeometry; identifier: string; properties: NSDictionary<string, NSObject>; boundingBox: GMSCoordinateBounds; });
+	constructor(o: { geometry: GMUGeometry; identifier: string; properties: NSDictionary<string, NSObject>; boundingBox: GMSCoordinateBounds });
 
 	class(): typeof NSObject;
 
@@ -377,18 +362,17 @@ declare class GMUFeature extends NSObject implements GMUGeometryContainer {
 }
 
 declare class GMUGeoJSONParser extends NSObject {
-
 	static alloc(): GMUGeoJSONParser; // inherited from NSObject
 
 	static new(): GMUGeoJSONParser; // inherited from NSObject
 
 	readonly features: NSArray<GMUGeometryContainer>;
 
-	constructor(o: { data: NSData; });
+	constructor(o: { data: NSData });
 
-	constructor(o: { stream: NSInputStream; });
+	constructor(o: { stream: NSInputStream });
 
-	constructor(o: { URL: NSURL; });
+	constructor(o: { URL: NSURL });
 
 	initWithData(data: NSData): this;
 
@@ -400,16 +384,13 @@ declare class GMUGeoJSONParser extends NSObject {
 }
 
 interface GMUGeometry extends NSObjectProtocol {
-
 	type: string;
 }
 declare var GMUGeometry: {
-
 	prototype: GMUGeometry;
 };
 
 declare class GMUGeometryCollection extends NSObject implements GMUGeometry {
-
 	static alloc(): GMUGeometryCollection; // inherited from NSObject
 
 	static new(): GMUGeometryCollection; // inherited from NSObject
@@ -428,9 +409,9 @@ declare class GMUGeometryCollection extends NSObject implements GMUGeometry {
 
 	readonly type: string; // inherited from GMUGeometry
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { geometries: NSArray<GMUGeometry> | GMUGeometry[]; });
+	constructor(o: { geometries: NSArray<GMUGeometry> | GMUGeometry[] });
 
 	class(): typeof NSObject;
 
@@ -458,29 +439,26 @@ declare class GMUGeometryCollection extends NSObject implements GMUGeometry {
 }
 
 interface GMUGeometryContainer extends NSObjectProtocol {
-
 	geometry: GMUGeometry;
 
 	style: GMUStyle;
 }
 declare var GMUGeometryContainer: {
-
 	prototype: GMUGeometryContainer;
 };
 
 declare class GMUGeometryRenderer extends NSObject {
-
 	static alloc(): GMUGeometryRenderer; // inherited from NSObject
 
 	static imageFromPath(path: string): UIImage;
 
 	static new(): GMUGeometryRenderer; // inherited from NSObject
 
-	constructor(o: { map: GMSMapView; geometries: NSArray<GMUGeometryContainer> | GMUGeometryContainer[]; });
+	constructor(o: { map: GMSMapView; geometries: NSArray<GMUGeometryContainer> | GMUGeometryContainer[] });
 
-	constructor(o: { map: GMSMapView; geometries: NSArray<GMUGeometryContainer> | GMUGeometryContainer[]; styles: NSArray<GMUStyle> | GMUStyle[]; });
+	constructor(o: { map: GMSMapView; geometries: NSArray<GMUGeometryContainer> | GMUGeometryContainer[]; styles: NSArray<GMUStyle> | GMUStyle[] });
 
-	constructor(o: { map: GMSMapView; geometries: NSArray<GMUGeometryContainer> | GMUGeometryContainer[]; styles: NSArray<GMUStyle> | GMUStyle[]; styleMaps: NSArray<GMUStyleMap> | GMUStyleMap[]; });
+	constructor(o: { map: GMSMapView; geometries: NSArray<GMUGeometryContainer> | GMUGeometryContainer[]; styles: NSArray<GMUStyle> | GMUStyle[]; styleMaps: NSArray<GMUStyleMap> | GMUStyleMap[] });
 
 	clear(): void;
 
@@ -498,7 +476,6 @@ declare class GMUGeometryRenderer extends NSObject {
 }
 
 declare class GMUGradient extends NSObject {
-
 	static alloc(): GMUGradient; // inherited from NSObject
 
 	static new(): GMUGradient; // inherited from NSObject
@@ -509,7 +486,7 @@ declare class GMUGradient extends NSObject {
 
 	readonly startPoints: NSArray<number>;
 
-	constructor(o: { colors: NSArray<UIColor> | UIColor[]; startPoints: NSArray<number> | number[]; colorMapSize: number; });
+	constructor(o: { colors: NSArray<UIColor> | UIColor[]; startPoints: NSArray<number> | number[]; colorMapSize: number });
 
 	generateColorMap(): NSArray<UIColor>;
 
@@ -517,7 +494,6 @@ declare class GMUGradient extends NSObject {
 }
 
 declare class GMUGridBasedClusterAlgorithm extends NSObject implements GMUClusterAlgorithm {
-
 	static alloc(): GMUGridBasedClusterAlgorithm; // inherited from NSObject
 
 	static new(): GMUGridBasedClusterAlgorithm; // inherited from NSObject
@@ -532,7 +508,7 @@ declare class GMUGridBasedClusterAlgorithm extends NSObject implements GMUCluste
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
 	addItems(items: NSArray<GMUClusterItem> | GMUClusterItem[]): void;
 
@@ -566,7 +542,6 @@ declare class GMUGridBasedClusterAlgorithm extends NSObject implements GMUCluste
 }
 
 declare class GMUGroundOverlay extends NSObject implements GMUGeometry {
-
 	static alloc(): GMUGroundOverlay; // inherited from NSObject
 
 	static new(): GMUGroundOverlay; // inherited from NSObject
@@ -593,9 +568,9 @@ declare class GMUGroundOverlay extends NSObject implements GMUGeometry {
 
 	readonly type: string; // inherited from GMUGeometry
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { coordinate: CLLocationCoordinate2D; southWest: CLLocationCoordinate2D; zIndex: number; rotation: number; href: string; });
+	constructor(o: { coordinate: CLLocationCoordinate2D; southWest: CLLocationCoordinate2D; zIndex: number; rotation: number; href: string });
 
 	class(): typeof NSObject;
 
@@ -623,7 +598,6 @@ declare class GMUGroundOverlay extends NSObject implements GMUGeometry {
 }
 
 declare class GMUHeatmapTileLayer extends GMSSyncTileLayer {
-
 	static alloc(): GMUHeatmapTileLayer; // inherited from NSObject
 
 	static new(): GMUHeatmapTileLayer; // inherited from NSObject
@@ -640,7 +614,6 @@ declare class GMUHeatmapTileLayer extends GMSSyncTileLayer {
 }
 
 declare class GMUKMLParser extends NSObject {
-
 	static alloc(): GMUKMLParser; // inherited from NSObject
 
 	static new(): GMUKMLParser; // inherited from NSObject
@@ -651,11 +624,11 @@ declare class GMUKMLParser extends NSObject {
 
 	readonly styles: NSArray<GMUStyle>;
 
-	constructor(o: { data: NSData; });
+	constructor(o: { data: NSData });
 
-	constructor(o: { stream: NSInputStream; });
+	constructor(o: { stream: NSInputStream });
 
-	constructor(o: { URL: NSURL; });
+	constructor(o: { URL: NSURL });
 
 	initWithData(data: NSData): this;
 
@@ -667,7 +640,6 @@ declare class GMUKMLParser extends NSObject {
 }
 
 declare class GMULineString extends NSObject implements GMUGeometry {
-
 	static alloc(): GMULineString; // inherited from NSObject
 
 	static new(): GMULineString; // inherited from NSObject
@@ -686,9 +658,9 @@ declare class GMULineString extends NSObject implements GMUGeometry {
 
 	readonly type: string; // inherited from GMUGeometry
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { path: GMSPath; });
+	constructor(o: { path: GMSPath });
 
 	class(): typeof NSObject;
 
@@ -716,7 +688,6 @@ declare class GMULineString extends NSObject implements GMUGeometry {
 }
 
 declare class GMUNonHierarchicalDistanceBasedAlgorithm extends NSObject implements GMUClusterAlgorithm {
-
 	static alloc(): GMUNonHierarchicalDistanceBasedAlgorithm; // inherited from NSObject
 
 	static new(): GMUNonHierarchicalDistanceBasedAlgorithm; // inherited from NSObject
@@ -731,9 +702,9 @@ declare class GMUNonHierarchicalDistanceBasedAlgorithm extends NSObject implemen
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { clusterDistancePoints: number; });
+	constructor(o: { clusterDistancePoints: number });
 
 	addItems(items: NSArray<GMUClusterItem> | GMUClusterItem[]): void;
 
@@ -769,7 +740,6 @@ declare class GMUNonHierarchicalDistanceBasedAlgorithm extends NSObject implemen
 }
 
 declare class GMUPair extends NSObject {
-
 	static alloc(): GMUPair; // inherited from NSObject
 
 	static new(): GMUPair; // inherited from NSObject
@@ -778,13 +748,12 @@ declare class GMUPair extends NSObject {
 
 	readonly styleUrl: string;
 
-	constructor(o: { key: string; styleUrl: string; });
+	constructor(o: { key: string; styleUrl: string });
 
 	initWithKeyStyleUrl(styleID: string, strokeColor: string): this;
 }
 
 declare class GMUPlacemark extends NSObject implements GMUGeometryContainer {
-
 	static alloc(): GMUPlacemark; // inherited from NSObject
 
 	static new(): GMUPlacemark; // inherited from NSObject
@@ -809,9 +778,9 @@ declare class GMUPlacemark extends NSObject implements GMUGeometryContainer {
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { geometry: GMUGeometry; title: string; snippet: string; style: GMUStyle; styleUrl: string; });
+	constructor(o: { geometry: GMUGeometry; title: string; snippet: string; style: GMUStyle; styleUrl: string });
 
 	class(): typeof NSObject;
 
@@ -839,7 +808,6 @@ declare class GMUPlacemark extends NSObject implements GMUGeometryContainer {
 }
 
 declare class GMUPoint extends NSObject implements GMUGeometry {
-
 	static alloc(): GMUPoint; // inherited from NSObject
 
 	static new(): GMUPoint; // inherited from NSObject
@@ -858,9 +826,9 @@ declare class GMUPoint extends NSObject implements GMUGeometry {
 
 	readonly type: string; // inherited from GMUGeometry
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { coordinate: CLLocationCoordinate2D; });
+	constructor(o: { coordinate: CLLocationCoordinate2D });
 
 	class(): typeof NSObject;
 
@@ -888,7 +856,6 @@ declare class GMUPoint extends NSObject implements GMUGeometry {
 }
 
 declare class GMUPolygon extends NSObject implements GMUGeometry {
-
 	static alloc(): GMUPolygon; // inherited from NSObject
 
 	static new(): GMUPolygon; // inherited from NSObject
@@ -907,9 +874,9 @@ declare class GMUPolygon extends NSObject implements GMUGeometry {
 
 	readonly type: string; // inherited from GMUGeometry
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { paths: NSArray<GMSPath> | GMSPath[]; });
+	constructor(o: { paths: NSArray<GMSPath> | GMSPath[] });
 
 	class(): typeof NSObject;
 
@@ -937,7 +904,6 @@ declare class GMUPolygon extends NSObject implements GMUGeometry {
 }
 
 declare class GMUSimpleClusterAlgorithm extends NSObject implements GMUClusterAlgorithm {
-
 	static alloc(): GMUSimpleClusterAlgorithm; // inherited from NSObject
 
 	static new(): GMUSimpleClusterAlgorithm; // inherited from NSObject
@@ -952,7 +918,7 @@ declare class GMUSimpleClusterAlgorithm extends NSObject implements GMUClusterAl
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
 	addItems(items: NSArray<GMUClusterItem> | GMUClusterItem[]): void;
 
@@ -986,7 +952,6 @@ declare class GMUSimpleClusterAlgorithm extends NSObject implements GMUClusterAl
 }
 
 declare class GMUStaticCluster extends NSObject implements GMUCluster {
-
 	static alloc(): GMUStaticCluster; // inherited from NSObject
 
 	static new(): GMUStaticCluster; // inherited from NSObject
@@ -1007,9 +972,9 @@ declare class GMUStaticCluster extends NSObject implements GMUCluster {
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { position: CLLocationCoordinate2D; });
+	constructor(o: { position: CLLocationCoordinate2D });
 
 	addItem(item: GMUClusterItem): void;
 
@@ -1041,7 +1006,6 @@ declare class GMUStaticCluster extends NSObject implements GMUCluster {
 }
 
 declare class GMUStyle extends NSObject {
-
 	static alloc(): GMUStyle; // inherited from NSObject
 
 	static new(): GMUStyle; // inherited from NSObject
@@ -1068,13 +1032,12 @@ declare class GMUStyle extends NSObject {
 
 	readonly width: number;
 
-	constructor(o: { styleID: string; strokeColor: UIColor; fillColor: UIColor; width: number; scale: number; heading: number; anchor: CGPoint; iconUrl: string; title: string; hasFill: boolean; hasStroke: boolean; });
+	constructor(o: { styleID: string; strokeColor: UIColor; fillColor: UIColor; width: number; scale: number; heading: number; anchor: CGPoint; iconUrl: string; title: string; hasFill: boolean; hasStroke: boolean });
 
 	initWithStyleIDStrokeColorFillColorWidthScaleHeadingAnchorIconUrlTitleHasFillHasStroke(styleID: string, strokeColor: UIColor, fillColor: UIColor, width: number, scale: number, heading: number, anchor: CGPoint, iconUrl: string, title: string, hasFill: boolean, hasStroke: boolean): this;
 }
 
 declare class GMUStyleMap extends NSObject {
-
 	static alloc(): GMUStyleMap; // inherited from NSObject
 
 	static new(): GMUStyleMap; // inherited from NSObject
@@ -1083,13 +1046,12 @@ declare class GMUStyleMap extends NSObject {
 
 	readonly styleMapId: string;
 
-	constructor(o: { id: string; pairs: NSArray<GMUPair> | GMUPair[]; });
+	constructor(o: { id: string; pairs: NSArray<GMUPair> | GMUPair[] });
 
 	initWithIdPairs(styleMapId: string, pairs: NSArray<GMUPair> | GMUPair[]): this;
 }
 
 declare class GMUWeightedLatLng extends NSObject implements GQTPointQuadTreeItem {
-
 	static alloc(): GMUWeightedLatLng; // inherited from NSObject
 
 	static new(): GMUWeightedLatLng; // inherited from NSObject
@@ -1106,9 +1068,9 @@ declare class GMUWeightedLatLng extends NSObject implements GQTPointQuadTreeItem
 
 	readonly superclass: typeof NSObject; // inherited from NSObjectProtocol
 
-	readonly  // inherited from NSObjectProtocol
+	readonly; // inherited from NSObjectProtocol
 
-	constructor(o: { coordinate: CLLocationCoordinate2D; intensity: number; });
+	constructor(o: { coordinate: CLLocationCoordinate2D; intensity: number });
 
 	class(): typeof NSObject;
 
@@ -1138,12 +1100,11 @@ declare class GMUWeightedLatLng extends NSObject implements GQTPointQuadTreeItem
 }
 
 declare class GMUWrappingDictionaryKey extends NSObject implements NSCopying {
-
 	static alloc(): GMUWrappingDictionaryKey; // inherited from NSObject
 
 	static new(): GMUWrappingDictionaryKey; // inherited from NSObject
 
-	constructor(o: { object: any; });
+	constructor(o: { object: any });
 
 	copyWithZone(zone: interop.Pointer | interop.Reference<any>): any;
 
@@ -1165,12 +1126,11 @@ interface GQTPoint {
 declare var GQTPoint: interop.StructType<GQTPoint>;
 
 declare class GQTPointQuadTree extends NSObject {
-
 	static alloc(): GQTPointQuadTree; // inherited from NSObject
 
 	static new(): GQTPointQuadTree; // inherited from NSObject
 
-	constructor(o: { bounds: GQTBounds; });
+	constructor(o: { bounds: GQTBounds });
 
 	add(item: GQTPointQuadTreeItem): boolean;
 
@@ -1186,7 +1146,6 @@ declare class GQTPointQuadTree extends NSObject {
 }
 
 declare class GQTPointQuadTreeChild extends NSObject {
-
 	static alloc(): GQTPointQuadTreeChild; // inherited from NSObject
 
 	static new(): GQTPointQuadTreeChild; // inherited from NSObject
@@ -1201,21 +1160,22 @@ declare class GQTPointQuadTreeChild extends NSObject {
 }
 
 interface GQTPointQuadTreeItem extends NSObjectProtocol {
-
 	point(): GQTPoint;
 }
 declare var GQTPointQuadTreeItem: {
-
 	prototype: GQTPointQuadTreeItem;
 };
 
 declare var GoogleMapsUtilsVersionNumber: number;
 
+declare var GoogleMapsUtilsVersionNumberVar: number;
+
 declare var GoogleMapsUtilsVersionString: interop.Reference<number>;
 
-declare class HeatMapInterpolationPoints extends NSObject {
+declare var GoogleMapsUtilsVersionStringVar: interop.Reference<number>;
 
-	static alloc(): HeatMapInterpolationPoints; // inherited from NSObject
+declare class HeatmapInterpolationPoints extends NSObject {
+	static alloc(): HeatmapInterpolationPoints; // inherited from NSObject
 
-	static new(): HeatMapInterpolationPoints; // inherited from NSObject
+	static new(): HeatmapInterpolationPoints; // inherited from NSObject
 }
diff --git a/packages/google-maps-utils/utils/index.android.ts b/packages/google-maps-utils/utils/index.android.ts
index 23206646..c8ee700d 100644
--- a/packages/google-maps-utils/utils/index.android.ts
+++ b/packages/google-maps-utils/utils/index.android.ts
@@ -4,6 +4,8 @@ import { GoogleMap } from '@nativescript/google-maps';
 import { HeatmapOptions } from '..';
 import { intoNativeHeatmapGradient } from './common';
 
+export * from './common';
+
 export function intoNativeHeatmapProvider(options: HeatmapOptions) {
 	if (options.coordinates) {
 		const builder = new com.google.maps.android.heatmaps.HeatmapTileProvider.Builder();
diff --git a/packages/google-maps-utils/utils/index.ios.ts b/packages/google-maps-utils/utils/index.ios.ts
index 0690e09c..e3f5e4fd 100644
--- a/packages/google-maps-utils/utils/index.ios.ts
+++ b/packages/google-maps-utils/utils/index.ios.ts
@@ -2,6 +2,8 @@ import { GoogleMap } from '@nativescript/google-maps';
 import { ClusterRenderer, HeatmapOptions, IGradient } from '..';
 import { intoNativeHeatmapGradient } from './common';
 
+export * from './common';
+
 export function intoNativeHeatmapProvider(options: HeatmapOptions) {
 	if (!options.coordinates) {
 		return;
diff --git a/tools/demo/google-maps-utils/index.ts b/tools/demo/google-maps-utils/index.ts
index 7d01190c..46ebdcb8 100644
--- a/tools/demo/google-maps-utils/index.ts
+++ b/tools/demo/google-maps-utils/index.ts
@@ -37,10 +37,6 @@ export class DemoSharedGoogleMapsUtils extends DemoSharedBase {
 			strokeColor: new Color('red'),
 			width: 4,
 		});
-
-		const features = this.geoJson.features;
-		features[0].style.fillColor = new Color('green');
-		features[1].style.strokeColor = new Color('yellow');
 	}
 
 	async onMapReady(args: MapReadyEvent) {