diff --git a/src/main/java/com/inteligr8/rs/AccessTokenRequestFilter.java b/src/main/java/com/inteligr8/rs/AccessTokenRequestFilter.java
index 630cb9c..d4e5b79 100644
--- a/src/main/java/com/inteligr8/rs/AccessTokenRequestFilter.java
+++ b/src/main/java/com/inteligr8/rs/AccessTokenRequestFilter.java
@@ -1,10 +1,9 @@
 package com.inteligr8.rs;
 
 import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.core.HttpHeaders;
 
-public class AccessTokenRequestFilter implements ClientRequestFilter {
+public class AccessTokenRequestFilter implements AuthorizationFilter {
 	
 	private final String token;
 	
diff --git a/src/main/java/com/inteligr8/rs/AuthorizationFilter.java b/src/main/java/com/inteligr8/rs/AuthorizationFilter.java
new file mode 100755
index 0000000..258ed47
--- /dev/null
+++ b/src/main/java/com/inteligr8/rs/AuthorizationFilter.java
@@ -0,0 +1,7 @@
+package com.inteligr8.rs;
+
+import javax.ws.rs.client.ClientRequestFilter;
+
+public interface AuthorizationFilter extends ClientRequestFilter {
+
+}
diff --git a/src/main/java/com/inteligr8/rs/BasicAuthRequestFilter.java b/src/main/java/com/inteligr8/rs/BasicAuthRequestFilter.java
index 8cd2e30..57ffce8 100644
--- a/src/main/java/com/inteligr8/rs/BasicAuthRequestFilter.java
+++ b/src/main/java/com/inteligr8/rs/BasicAuthRequestFilter.java
@@ -4,10 +4,9 @@ import java.io.UnsupportedEncodingException;
 import java.util.Base64;
 
 import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.core.HttpHeaders;
 
-public class BasicAuthRequestFilter implements ClientRequestFilter {
+public class BasicAuthRequestFilter implements AuthorizationFilter {
 	
 	private final String username;
 	private final String password;
diff --git a/src/main/java/com/inteligr8/rs/OAuthRequestFilter.java b/src/main/java/com/inteligr8/rs/OAuthRequestFilter.java
index 2c4edce..5a270d2 100644
--- a/src/main/java/com/inteligr8/rs/OAuthRequestFilter.java
+++ b/src/main/java/com/inteligr8/rs/OAuthRequestFilter.java
@@ -5,7 +5,6 @@ import java.util.Map;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.ClientRequestContext;
-import javax.ws.rs.client.ClientRequestFilter;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Form;
@@ -13,7 +12,7 @@ import javax.ws.rs.core.HttpHeaders;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 
-public abstract class OAuthRequestFilter implements ClientRequestFilter {
+public abstract class OAuthRequestFilter implements AuthorizationFilter {
 	
 	private final String tokenUrl;
 	private final String clientId;
@@ -50,8 +49,7 @@ public abstract class OAuthRequestFilter implements ClientRequestFilter {
 		Form form;
 		
 		if (this.refreshToken != null) {
-			form = new Form().param("grant_type", "refresh_token")
-					.param("refresh_token", this.refreshToken);
+			form = this.createRefreshForm();
 		} else {
 			form = this.createForm();
 		}
@@ -80,6 +78,11 @@ public abstract class OAuthRequestFilter implements ClientRequestFilter {
 		this.refreshToken = (String)response.get("refresh_token");
 	}
 	
+	protected Form createRefreshForm() {
+		return new Form().param("grant_type", "refresh_token")
+				.param("refresh_token", this.refreshToken);
+	}
+	
 	protected abstract Form createForm();
 
 }