diff --git a/Application.kt b/Application.kt
new file mode 100644
index 00000000..0708653a
--- /dev/null
+++ b/Application.kt
@@ -0,0 +1,35 @@
+//package com.cloud.diplomaticquarterapp
+package com.ejada.hmg
+
+import io.flutter.app.FlutterApplication
+import io.flutter.plugin.common.PluginRegistry
+import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
+import io.flutter.plugins.GeneratedPluginRegistrant
+import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
+
+class Application : FlutterApplication(), PluginRegistrantCallback {
+    override fun onCreate() {
+        super.onCreate()
+        FlutterFirebaseMessagingService.setPluginRegistrant(this)
+    }
+
+    override fun registerWith(registry: PluginRegistry) {
+        io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
+    }
+}
+
+//import io.flutter.app.FlutterApplication
+//import io.flutter.plugin.common.PluginRegistry
+//import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
+//import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
+//
+//class Application : FlutterApplication(), PluginRegistrantCallback {
+//    override fun onCreate() {
+//        super.onCreate()
+//        FlutterFirebaseMessagingService.setPluginRegistrant(this)
+//    }
+//
+//    override fun registerWith(registry: PluginRegistry?) {
+//        FirebaseCloudMessagingPluginRegistrant.registerWith(registry)
+//    }
+//}
\ No newline at end of file
diff --git a/FirebaseCloudMessagingPluginRegistrant.kt b/FirebaseCloudMessagingPluginRegistrant.kt
new file mode 100644
index 00000000..9ac064cb
--- /dev/null
+++ b/FirebaseCloudMessagingPluginRegistrant.kt
@@ -0,0 +1,23 @@
+//package com.cloud.diplomaticquarterapp
+package com.ejada.hmg
+
+import io.flutter.plugin.common.PluginRegistry
+import io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin
+
+object FirebaseCloudMessagingPluginRegistrant {
+    fun registerWith(registry: PluginRegistry?) {
+        if (alreadyRegisteredWith(registry)) {
+            return
+        }
+        FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"))
+    }
+
+    private fun alreadyRegisteredWith(registry: PluginRegistry?): Boolean {
+        val key: String? = FirebaseCloudMessagingPluginRegistrant::class.java.canonicalName
+        if (registry?.hasPlugin(key)!!) {
+            return true
+        }
+        registry.registrarFor(key)
+        return false
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/Application.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/Application.kt
new file mode 100644
index 00000000..0708653a
--- /dev/null
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/Application.kt
@@ -0,0 +1,35 @@
+//package com.cloud.diplomaticquarterapp
+package com.ejada.hmg
+
+import io.flutter.app.FlutterApplication
+import io.flutter.plugin.common.PluginRegistry
+import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
+import io.flutter.plugins.GeneratedPluginRegistrant
+import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
+
+class Application : FlutterApplication(), PluginRegistrantCallback {
+    override fun onCreate() {
+        super.onCreate()
+        FlutterFirebaseMessagingService.setPluginRegistrant(this)
+    }
+
+    override fun registerWith(registry: PluginRegistry) {
+        io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"));
+    }
+}
+
+//import io.flutter.app.FlutterApplication
+//import io.flutter.plugin.common.PluginRegistry
+//import io.flutter.plugin.common.PluginRegistry.PluginRegistrantCallback
+//import io.flutter.plugins.firebasemessaging.FlutterFirebaseMessagingService
+//
+//class Application : FlutterApplication(), PluginRegistrantCallback {
+//    override fun onCreate() {
+//        super.onCreate()
+//        FlutterFirebaseMessagingService.setPluginRegistrant(this)
+//    }
+//
+//    override fun registerWith(registry: PluginRegistry?) {
+//        FirebaseCloudMessagingPluginRegistrant.registerWith(registry)
+//    }
+//}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/FirebaseCloudMessagingPluginRegistrant.kt b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/FirebaseCloudMessagingPluginRegistrant.kt
new file mode 100644
index 00000000..9ac064cb
--- /dev/null
+++ b/android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/FirebaseCloudMessagingPluginRegistrant.kt
@@ -0,0 +1,23 @@
+//package com.cloud.diplomaticquarterapp
+package com.ejada.hmg
+
+import io.flutter.plugin.common.PluginRegistry
+import io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin
+
+object FirebaseCloudMessagingPluginRegistrant {
+    fun registerWith(registry: PluginRegistry?) {
+        if (alreadyRegisteredWith(registry)) {
+            return
+        }
+        FirebaseMessagingPlugin.registerWith(registry?.registrarFor("io.flutter.plugins.firebasemessaging.FirebaseMessagingPlugin"))
+    }
+
+    private fun alreadyRegisteredWith(registry: PluginRegistry?): Boolean {
+        val key: String? = FirebaseCloudMessagingPluginRegistrant::class.java.canonicalName
+        if (registry?.hasPlugin(key)!!) {
+            return true
+        }
+        registry.registrarFor(key)
+        return false
+    }
+}
\ No newline at end of file