diff --git a/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/src/main/java/waffle/spring/boot/WaffleAutoConfiguration.java b/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/src/main/java/waffle/spring/boot/WaffleAutoConfiguration.java
index 6f3211f444..9e1187ae79 100644
--- a/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/src/main/java/waffle/spring/boot/WaffleAutoConfiguration.java
+++ b/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/src/main/java/waffle/spring/boot/WaffleAutoConfiguration.java
@@ -44,6 +44,7 @@
 import waffle.spring.NegotiateSecurityFilterEntryPoint;
 import waffle.spring.WindowsAuthenticationProvider;
 import waffle.spring.WindowsAuthenticationToken;
+import waffle.windows.auth.IWindowsAuthProvider;
 import waffle.windows.auth.impl.WindowsAuthProviderImpl;
 
 /**
@@ -117,7 +118,7 @@ public GrantedAuthorityFactory grantedAuthorityFactory() {
     @Bean
     @ConditionalOnMissingBean
     public WindowsAuthenticationProvider waffleSpringAuthenticationProvider(
-            final WindowsAuthProviderImpl waffleWindowsAuthProvider,
+            final IWindowsAuthProvider waffleWindowsAuthProvider,
             @Qualifier("defaultGrantedAuthority") final GrantedAuthority defaultGrantedAuthority,
             final GrantedAuthorityFactory grantedAuthorityFactory) {
         final WindowsAuthenticationProvider bean = new WindowsAuthenticationProvider();
@@ -143,7 +144,7 @@ public WindowsAuthenticationProvider waffleSpringAuthenticationProvider(
     @ConditionalOnProperty("waffle.sso.enabled")
     @ConditionalOnMissingBean
     public NegotiateSecurityFilterProvider negotiateSecurityFilterProvider(
-            final WindowsAuthProviderImpl windowsAuthProvider) {
+            final IWindowsAuthProvider windowsAuthProvider) {
         final NegotiateSecurityFilterProvider bean = new NegotiateSecurityFilterProvider(windowsAuthProvider);
         bean.setProtocols(this.properties.getSso().getProtocols());
         return bean;
@@ -161,7 +162,7 @@ public NegotiateSecurityFilterProvider negotiateSecurityFilterProvider(
     @Bean
     @ConditionalOnProperty("waffle.sso.enabled")
     @ConditionalOnMissingBean
-    public BasicSecurityFilterProvider basicSecurityFilterProvider(final WindowsAuthProviderImpl windowsAuthProvider) {
+    public BasicSecurityFilterProvider basicSecurityFilterProvider(final IWindowsAuthProvider windowsAuthProvider) {
         return new BasicSecurityFilterProvider(windowsAuthProvider);
     }
 
@@ -252,7 +253,7 @@ public NegotiateSecurityFilter waffleNegotiateSecurityFilter(final SecurityFilte
     @Bean
     @ConditionalOnProperty("waffle.sso.enabled")
     public FilterRegistrationBean<NegotiateSecurityFilter> waffleNegotiateSecurityFilterRegistrationBean(
-            final NegotiateSecurityFilter filter) {
+            final Filter filter) {
         final FilterRegistrationBean<NegotiateSecurityFilter> bean = new FilterRegistrationBean<>(filter);
         bean.setEnabled(false);
         return bean;