diff --git a/README.md b/README.md
index 5463cd8..dd8e0a7 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Use [Vortex](https://github.com/equilaterus/Vortex) side-by-side with **AutoMapp
 using Equilaterus.Vortex.AutoMapper.Extensions;
 ...
 
-// Returns IMaybe<DestinationType>
+// Returns Maybe<DestinationType>
 var maybeResult = IMapper.MaybeMap<DestinationType>(sourceEntity);
 ```
 
diff --git a/appveyor.yml b/appveyor.yml
index 44fe9c6..2012f95 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,13 +1,13 @@
-version: 0.1.0.{build}
+version: 0.1.1.{build}
 image: Visual Studio 2019
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
-  version: '0.1.0'
-  package_version: '0.1.0-alpha'
-  assembly_version: '0.1.0'
-  file_version: '0.1.0'
-  informational_version: '0.1.0'
+  version: '0.1.1'
+  package_version: '0.1.1-alpha'
+  assembly_version: '0.1.1'
+  file_version: '0.1.1'
+  informational_version: '0.1.1'
 before_build:
 - cmd: nuget restore
 build:
diff --git a/src/MapperExtensions.cs b/src/MapperExtensions.cs
index 4f54143..d22674a 100644
--- a/src/MapperExtensions.cs
+++ b/src/MapperExtensions.cs
@@ -14,10 +14,34 @@ public static Maybe<TDestination> MaybeMap<TDestination>(
             return new Maybe<TDestination>(mapper.Map<TDestination>(source));
         }
 
+        public static Maybe<TDestination> MaybeMap<TDestination>(
+            this IMapper mapper, object source, Action<IMappingOperationOptions> opts)
+        {
+            return new Maybe<TDestination>(mapper.Map<TDestination>(source, opts));
+        }
+
+        public static Maybe<TDestination> MaybeMap<TSource, TDestination>(
+            this IMapper mapper, TSource source)
+        {
+            return new Maybe<TDestination>(mapper.Map<TSource, TDestination>(source));
+        }
+
+        public static Maybe<TDestination> MaybeMap<TSource, TDestination>(
+            this IMapper mapper, TSource source, Action<IMappingOperationOptions<TSource, TDestination>> opts)
+        {
+            return new Maybe<TDestination>(mapper.Map<TSource, TDestination>(source, opts));
+        }
+
         public static Maybe<TDestination> MaybeMap<TSource, TDestination>(
             this IMapper mapper, TSource source, TDestination destination)
         {
             return new Maybe<TDestination>(mapper.Map(source, destination));
         }
+
+        public static Maybe<TDestination> MaybeMap<TSource, TDestination>(
+            this IMapper mapper, TSource source, TDestination destination, Action<IMappingOperationOptions<TSource, TDestination>> opts)
+        {
+            return new Maybe<TDestination>(mapper.Map(source, destination, opts));
+        }
     }
 }
diff --git a/test/MapperExtensions.Test.cs b/test/MapperExtensions.Test.cs
index c945c9e..69db7db 100644
--- a/test/MapperExtensions.Test.cs
+++ b/test/MapperExtensions.Test.cs
@@ -13,13 +13,15 @@ public class MapperExtensions
         [Fact]
         public void MaybeMap_Success()
         {
+            // Prepare
             var mapperMock = new Mock<IMapper>();
             mapperMock.Setup(x => x.Map<double>(1))
                 .Returns(1.2);
 
-            var objectMock = mapperMock.Object;
-            var result = objectMock.MaybeMap<double>(1);
+            // Execute
+            var result = mapperMock.Object.MaybeMap<double>(1);
 
+            // Verify
             Assert.IsType<Maybe<double>>(result);
             Assert.Equal(1.2, result.Match(x => x, 0));
         }
@@ -27,25 +29,111 @@ public void MaybeMap_Success()
         [Fact]
         public void MaybeMap_Null_ThrowsException()
         {
+            // Prepare
             var mapperMock = new Mock<IMapper>();
-            mapperMock.Setup(x => x.Map<object>(It.IsAny<object>()))
+            mapperMock.Setup(x => x.Map<object>(null))
                 .Returns(null);
 
-            var objectMock = mapperMock.Object;           
+            // Execute
+            Assert.Throws<ArgumentNullException>(() => mapperMock.Object.MaybeMap<object>(null));
+        }
+
+        [Fact]
+        public void MaybeMapOpts_Success()
+        {
+            // Prepare
+            var mapperMock = new Mock<IMapper>();
+            mapperMock.Setup(x => x.Map<double>(1, null))
+                .Returns(1.2);
+
+            // Execute
+            var result = mapperMock.Object.MaybeMap<double>(1, null);
+
+            // Verify
+            Assert.IsType<Maybe<double>>(result);
+            Assert.Equal(1.2, result.Match(x => x, 0));
+        }
+
+        [Fact]
+        public void MaybeMapOpts_Null_ThrowsException()
+        {
+            // Prepare
+            var mapperMock = new Mock<IMapper>();
+            mapperMock.Setup(x => x.Map<object>(null, null))
+                .Returns(null);
+
+            // Execute
+            Assert.Throws<ArgumentNullException>(() => mapperMock.Object.MaybeMap<object>(null, null));
+        }
+
+        [Fact]
+        public void MaybeMapDestination_Success()
+        {
+            // Prepare
+            var mapperMock = new Mock<IMapper>();
+            mapperMock.Setup(x => x.Map<int, double>(1))
+                .Returns(1.2);
+
+            // Execute
+            var result = mapperMock.Object.MaybeMap<int, double>(1);
+
+            // Verify
+            Assert.IsType<Maybe<double>>(result);
+            Assert.Equal(1.2, result.Match(x => x, 0));
+        }
+
+        [Fact]
+        public void MaybeMapDestination_Null_ThrowsException()
+        {
+            // Prepare
+            var mapperMock = new Mock<IMapper>();
+            mapperMock.Setup(x => x.Map<string, object>(null))
+                .Returns(null);
 
-            Assert.Throws<ArgumentNullException>(() => objectMock.MaybeMap<object>(new object()));
+            // Execute
+            Assert.Throws<ArgumentNullException>(() => mapperMock.Object.MaybeMap<string, object>(null));
+        }
+
+        [Fact]
+        public void MaybeMapDestinationOpt_Success()
+        {
+            // Prepare
+            var mapperMock = new Mock<IMapper>();
+            mapperMock.Setup(x => x.Map<int, double>(1, null))
+                .Returns(1.2);
+
+            // Execute
+            var result = mapperMock.Object.MaybeMap<int, double>(1, null);
+
+            // Verify
+            Assert.IsType<Maybe<double>>(result);
+            Assert.Equal(1.2, result.Match(x => x, 0));
+        }
+
+        [Fact]
+        public void MaybeMapDestinationOpt_Null_ThrowsException()
+        {
+            // Prepare
+            var mapperMock = new Mock<IMapper>();
+            mapperMock.Setup(x => x.Map<string, object>(null, null))
+                .Returns(null);
+
+            // Execute
+            Assert.Throws<ArgumentNullException>(() => mapperMock.Object.MaybeMap<string, object>(null, null));
         }
 
         [Fact]
         public void MaybeMap_SourceDestination_Success()
         {
+            // Prepare
             var mapperMock = new Mock<IMapper>();
-            mapperMock.Setup(x => x.Map(It.IsAny<object>(), It.IsAny<double>()))
+            mapperMock.Setup(x => x.Map("1", 0.2))
                 .Returns(1.2);
 
-            var objectMock = mapperMock.Object;
-            var result = objectMock.MaybeMap(new object(), new double());
+            // Execute
+            var result = mapperMock.Object.MaybeMap("1", 0.2);
 
+            // Verify
             Assert.IsType<Maybe<double>>(result);
             Assert.Equal(1.2, result.Match(x => x, 0));
         }
@@ -53,13 +141,41 @@ public void MaybeMap_SourceDestination_Success()
         [Fact]
         public void MaybeMap_SourceDestination_Null_ThrowsException()
         {
+            // Prepare
             var mapperMock = new Mock<IMapper>();
-            mapperMock.Setup(x => x.Map(It.IsAny<object>(), It.IsAny<object>()))
+            mapperMock.Setup(x => x.Map<object, object>(null, null))
                 .Returns(null);
+            
+            // Execute
+            Assert.Throws<ArgumentNullException>(() => mapperMock.Object.MaybeMap<object, object>(null, new object()));
+        }
+
+        [Fact]
+        public void MaybeMapOpt_SourceDestination_Success()
+        {
+            // Prepare
+            var mapperMock = new Mock<IMapper>();
+            mapperMock.Setup(x => x.Map("1", 0.2, null))
+                .Returns(1.2);
+
+            // Execute
+            var result = mapperMock.Object.MaybeMap("1", 0.2, null);
 
-            var objectMock = mapperMock.Object;
+            // Verify
+            Assert.IsType<Maybe<double>>(result);
+            Assert.Equal(1.2, result.Match(x => x, 0));
+        }
+
+        [Fact]
+        public void MaybeMapOpt_SourceDestination_Null_ThrowsException()
+        {
+            // Prepare
+            var mapperMock = new Mock<IMapper>();
+            mapperMock.Setup(x => x.Map<object, object>(null, null, null))
+                .Returns(null);
 
-            Assert.Throws<ArgumentNullException>(() => objectMock.MaybeMap(new object(), new object()));
+            // Execute
+            Assert.Throws<ArgumentNullException>(() => mapperMock.Object.MaybeMap<object, object>(null, new object(), null));
         }
     }
 }