diff --git a/OneSignal.Android.Binding/Jars/onesignal-release.aar b/OneSignal.Android.Binding/Jars/onesignal-release.aar
index 9f7b8514..ce926587 100644
Binary files a/OneSignal.Android.Binding/Jars/onesignal-release.aar and b/OneSignal.Android.Binding/Jars/onesignal-release.aar differ
diff --git a/OneSignal.Android.Binding/OneSignal.Android.Binding.csproj b/OneSignal.Android.Binding/OneSignal.Android.Binding.csproj
index 13c7b5bf..f2c2ee64 100644
--- a/OneSignal.Android.Binding/OneSignal.Android.Binding.csproj
+++ b/OneSignal.Android.Binding/OneSignal.Android.Binding.csproj
@@ -10,7 +10,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AssemblyName>OneSignal.Android.Binding</AssemblyName>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
     <AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">28.0.3</AndroidSdkBuildToolsVersion>
     <AndroidTlsProvider></AndroidTlsProvider>
     <AndroidClassParser>class-parse</AndroidClassParser>
@@ -55,5 +55,8 @@
   <ItemGroup>
     <LibraryProjectZip Include="Jars\onesignal-release.aar" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.AndroidX.Core" Version="1.12.0.2" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/OneSignal.Android.Binding/Transforms/EnumFields.xml b/OneSignal.Android.Binding/Transforms/EnumFields.xml
index e9af0eeb..4b78e6e7 100755
--- a/OneSignal.Android.Binding/Transforms/EnumFields.xml
+++ b/OneSignal.Android.Binding/Transforms/EnumFields.xml
@@ -4,7 +4,7 @@
   and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
   to an enum called Android.Support.V4.App.FragmentTagType with values
   Id, Name, and Tag.
-  
+
   <mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
     <field clr-name="Id" jni-name="Fragment_id" value="1" />
     <field clr-name="Name" jni-name="Fragment_name" value="0" />
diff --git a/OneSignalSDK.Xamarin.Android/NotificationExtensionAttribute.cs b/OneSignalSDK.Xamarin.Android/NotificationExtensionAttribute.cs
new file mode 100644
index 00000000..796d05cf
--- /dev/null
+++ b/OneSignalSDK.Xamarin.Android/NotificationExtensionAttribute.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Diagnostics;
+using Android.App;
+using Android.Content;
+
+namespace Com.OneSignal.Android
+{
+    [Serializable]
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+    public sealed class NotificationExtensionAttribute : Attribute, Java.Interop.IJniNameProviderAttribute
+    {
+        public string Name { get; set; }
+        public NotificationExtensionAttribute()
+        {
+        }
+    }
+}
diff --git a/OneSignalSDK.Xamarin.Android/OneSignalSDK.Xamarin.Android.csproj b/OneSignalSDK.Xamarin.Android/OneSignalSDK.Xamarin.Android.csproj
index f5791dd5..7d329cab 100644
--- a/OneSignalSDK.Xamarin.Android/OneSignalSDK.Xamarin.Android.csproj
+++ b/OneSignalSDK.Xamarin.Android/OneSignalSDK.Xamarin.Android.csproj
@@ -11,7 +11,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>OneSignalSDK.Xamarin</RootNamespace>
     <AssemblyName>OneSignalSDK.Xamarin</AssemblyName>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidTlsProvider>
@@ -284,6 +284,7 @@
     </Compile>
     <Compile Include="Utilities\NativeConversion.cs" />
     <Compile Include="OneSignalCallbacks.cs" />
+    <Compile Include="NotificationExtensionAttribute.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OneSignal.Android.Binding\OneSignal.Android.Binding.csproj">
@@ -371,4 +372,4 @@
   <Import Project="..\packages\Xamarin.Jetbrains.Annotations.22.0.0.2\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets" Condition="Exists('..\packages\Xamarin.Jetbrains.Annotations.22.0.0.2\build\monoandroid90\Xamarin.Jetbrains.Annotations.targets')" />
   <Import Project="..\packages\Xamarin.Kotlin.StdLib.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.targets')" />
   <Import Project="..\packages\Xamarin.Kotlin.StdLib.Common.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Common.targets')" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Samples/OneSignalApp.Sample.Droid/OneSignalApp.Sample.Droid.csproj b/Samples/OneSignalApp.Sample.Droid/OneSignalApp.Sample.Droid.csproj
index 60c9c6c8..ecbfcbd3 100644
--- a/Samples/OneSignalApp.Sample.Droid/OneSignalApp.Sample.Droid.csproj
+++ b/Samples/OneSignalApp.Sample.Droid/OneSignalApp.Sample.Droid.csproj
@@ -10,7 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>OneSignalApp.Sample.Droid</RootNamespace>
     <AssemblyName>OneSignalApp.Sample.Droid</AssemblyName>
-    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -392,4 +392,4 @@
   <Import Project="..\..\packages\Xamarin.Kotlin.StdLib.Jdk7.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Jdk7.targets" Condition="Exists('..\..\packages\Xamarin.Kotlin.StdLib.Jdk7.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Jdk7.targets')" />
   <Import Project="..\..\packages\Xamarin.Kotlin.StdLib.Jdk8.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Jdk8.targets" Condition="Exists('..\..\packages\Xamarin.Kotlin.StdLib.Jdk8.1.5.31.2\build\monoandroid90\Xamarin.Kotlin.StdLib.Jdk8.targets')" />
   <Import Project="..\..\packages\Xamarin.Build.Download.0.11.2\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.11.2\build\Xamarin.Build.Download.targets')" />
-</Project>
\ No newline at end of file
+</Project>