diff --git a/Net.Maui.Extensions/Extensions/ContentPageExtensions.cs b/Net.Maui.Extensions/Extensions/ContentPageExtensions.cs
index 3b51712..fdfd333 100644
--- a/Net.Maui.Extensions/Extensions/ContentPageExtensions.cs
+++ b/Net.Maui.Extensions/Extensions/ContentPageExtensions.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using Net.Maui.Extensions.ControlFlow;
+using System.ComponentModel;
 using System.Core.Extensions;
 using System.Extensions;
 
@@ -6,9 +7,9 @@ namespace Net.Maui.Extensions.Extensions;
 
 public static class ContentPageExtensions
 {
-    public static T GetBindingContext<T>(this ContentPage contentPage)
-        where T : INotifyPropertyChanged
+    public static T? GetBindingContext<T>(this IPageViewModel<T> page)
+        where T : class, INotifyPropertyChanged, new()
     {
-        return contentPage.ThrowIfNull().BindingContext.Cast<T>();
+        return page.As<BindableObject>()?.ThrowIfNull()?.BindingContext.As<T>();
     }
 }
diff --git a/Net.Maui.Extensions/Net.Maui.Extensions.csproj b/Net.Maui.Extensions/Net.Maui.Extensions.csproj
index c6ef040..8be877f 100644
--- a/Net.Maui.Extensions/Net.Maui.Extensions.csproj
+++ b/Net.Maui.Extensions/Net.Maui.Extensions.csproj
@@ -20,7 +20,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
-    <Version>0.2.10</Version>
+    <Version>0.2.11</Version>
     <Authors>Alexandru Macocian</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>