diff --git a/pom.xml b/pom.xml
index c054f9f..3fafeef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,6 @@
 		<maven.compiler.target>8</maven.compiler.target>
 		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
 
-		<!-- If you want to build for your specific version, point to your own 
-			installation -->
 		<aps.app.tag>aps1</aps.app.tag>
 
 		<jersey.version>2.35</jersey.version>
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
index a1f43d1..9c69cb9 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
@@ -16,18 +16,34 @@ import com.inteligr8.alfresco.activiti.api.TasksApi;
  */
 public interface ApsPublicRestApi {
 	
-	AdminApi getAdminApi();
+	<T> T getApi(Class<T> apiClass);
 	
-	AppDefinitionsApi getAppDefinitionsApi();
+	default AdminApi getAdminApi() {
+		return this.getApi(AdminApi.class);
+	}
 	
-	AppVersionApi getAppVersionApi();
+	default AppDefinitionsApi getAppDefinitionsApi() {
+		return this.getApi(AppDefinitionsApi.class);
+	}
 	
-	ModelsApi getModelsApi();
+	default AppVersionApi getAppVersionApi() {
+		return this.getApi(AppVersionApi.class);
+	}
 	
-	ProcessInstancesApi getProcessInstancesApi();
+	default ModelsApi getModelsApi() {
+		return this.getApi(ModelsApi.class);
+	}
 	
-	ProfileApi getProfileApi();
+	default ProcessInstancesApi getProcessInstancesApi() {
+		return this.getApi(ProcessInstancesApi.class);
+	}
 	
-	TasksApi getTasksApi();
+	default ProfileApi getProfileApi() {
+		return this.getApi(ProfileApi.class);
+	}
+	
+	default TasksApi getTasksApi() {
+		return this.getApi(TasksApi.class);
+	}
 
 }
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java
index 54994b0..0dea71d 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java
@@ -11,6 +11,8 @@ import com.inteligr8.alfresco.activiti.api.AppDefinitionsCxfApi;
  */
 public interface ApsPublicRestCxfApi extends ApsPublicRestApi {
 	
-	AppDefinitionsCxfApi getAppDefinitionsCxfApi();
+	default AppDefinitionsCxfApi getAppDefinitionsCxfApi() {
+		return this.getApi(AppDefinitionsCxfApi.class);
+	}
 
 }
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java
index 66bc8b9..eb922ee 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java
@@ -11,6 +11,8 @@ import com.inteligr8.alfresco.activiti.api.AppDefinitionsJerseyApi;
  */
 public interface ApsPublicRestJerseyApi extends ApsPublicRestApi {
 	
-	AppDefinitionsJerseyApi getAppDefinitionsJerseyApi();
+	default AppDefinitionsJerseyApi getAppDefinitionsJerseyApi() {
+		return this.getApi(AppDefinitionsJerseyApi.class);
+	}
 
 }