diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/GraphQLController.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/GraphQLController.java
index b36a52d..2311455 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/GraphQLController.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/GraphQLController.java
@@ -12,11 +12,9 @@
 import net.brianlevine.keycloak.graphql.queries.ErrorQuery;
 import net.brianlevine.keycloak.graphql.queries.RealmQuery;
 import net.brianlevine.keycloak.graphql.queries.UserQuery;
-
 import net.brianlevine.keycloak.graphql.util.OverrideTypeInfoGenerator;
 import org.keycloak.models.KeycloakSession;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -68,9 +66,6 @@ public Map<String, Object> executeQuery(String query, String operationName, Keyc
         return executionResult.toSpecification();
     }
 
-    public Map<String, Object> executeQuery(String query, String operationName, KeycloakSession session, Request request, HttpHeaders headers) {
-        return executeQuery(query, operationName, session, request, headers, Collections.emptyMap());
-    }
 
     public String printSchema() {
 
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/annotations/GraphQLOverrideTypeName.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/annotations/GraphQLOverrideTypeName.java
index 79e305f..2e58912 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/annotations/GraphQLOverrideTypeName.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/annotations/GraphQLOverrideTypeName.java
@@ -7,7 +7,8 @@
 
 /**
  * For InputTypes and Scalars. Classes annotated with GraphQLOverrideTypeName will not have a suffix ('Input' for
- * InputTypes and 'Scalar' for Scalar types) appended.
+ * InputTypes and 'Scalar' for Scalar types) appended. The name of the class or the name given in the
+ * @GraphQLInputType/@GraphQLScalar annotations will be used without modification.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/queries/RealmQuery.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/queries/RealmQuery.java
index 0f5157e..024bab9 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/queries/RealmQuery.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/queries/RealmQuery.java
@@ -1,6 +1,7 @@
 package net.brianlevine.keycloak.graphql.queries;
 
 import jakarta.ws.rs.ForbiddenException;
+import net.brianlevine.keycloak.graphql.types.PagingOptions;
 import net.brianlevine.keycloak.graphql.util.Page;
 import net.brianlevine.keycloak.graphql.util.Auth;
 
@@ -25,10 +26,7 @@
 public class RealmQuery {
 
     @GraphQLQuery(name = "realms", description = "Return a collection of realms that are viewable by the caller.")
-    public Page<RealmType> getRealms(
-            @GraphQLRootContext GraphQLContext ctx,
-            @GraphQLArgument(name="limit", defaultValue = "100") int limit,
-            @GraphQLArgument(name="start", defaultValue = "0") int start) {
+    public Page<RealmType> getRealms(PagingOptions options, @GraphQLRootContext GraphQLContext ctx) {
 
         KeycloakSession session = ctx.get("keycloak.session");
         HttpHeaders headers = ctx.get("headers");
@@ -41,11 +39,15 @@ public Page<RealmType> getRealms(
                     .filter(Objects::nonNull)
                     .toList();
 
+            options = options == null ? new PagingOptions() : options;
+
             List<RealmType> realmTypes = realms.stream()
+                    .skip(options.start)
+                    .limit(options.limit)
                     .map(rep -> rep != null ? new RealmType(session, rep) : null)
                     .toList();
 
-            ret = new Page<>(realms.size(), limit, realmTypes);
+            ret = new Page<>(realms.size(), options.limit, realmTypes);
         } catch (ForbiddenException e) {
             ret = Page.emptyPage();
         }
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/rest/GraphQLResourceProvider.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/rest/GraphQLResourceProvider.java
index 2683419..a5c08cf 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/rest/GraphQLResourceProvider.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/rest/GraphQLResourceProvider.java
@@ -18,6 +18,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
 import java.util.Map;
 
 
@@ -52,16 +53,23 @@ public void close() {
 	public Response postGraphQL(Map<String, Object> body, @Context Request request, @Context HttpHeaders headers) throws JsonProcessingException {
 		String query = (String)body.get("query");
 		String operationName = (String)body.get("operationName");
-		//String variables = (String)body.get("variables");
+		Object variables = body.get("variables");
 
-		// TODO: Deal with variables.
+		@SuppressWarnings("unchecked")
+		Map<String, Object> result = graphql.executeQuery(
+				query,
+				operationName,
+				session,
+				request,
+				headers,
+				variables != null ? (Map<String, Object>) variables : Collections.emptyMap());
 
-		Map<String, Object> result = graphql.executeQuery(query, operationName, session, request, headers);
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
+
+        //noinspection deprecation
+        mapper.enable(SerializationFeature.WRITE_NULL_MAP_VALUES);
 		String s = mapper.writeValueAsString(result);
 
-		//return Response.ok(s).header("Access-Control-Allow-Origin", "*").header("Access-Control-Allow-Credentials", "true").build();
 		return Response.ok(s).build();
 	}
 
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientPolicyConditionType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientPolicyConditionType.java
new file mode 100644
index 0000000..a741e90
--- /dev/null
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientPolicyConditionType.java
@@ -0,0 +1,44 @@
+package net.brianlevine.keycloak.graphql.types;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.leangen.graphql.annotations.types.GraphQLType;
+import org.keycloak.representations.idm.ClientPolicyConditionRepresentation;
+
+import java.util.Objects;
+
+@GraphQLType
+@SuppressWarnings("unused")
+public class ClientPolicyConditionType {
+    private final ClientPolicyConditionRepresentation delegate;
+
+    public ClientPolicyConditionType(ClientPolicyConditionRepresentation clientPolicyConditionRepresentation) {
+        this.delegate = clientPolicyConditionRepresentation;
+    }
+
+    public String getConditionProviderId() {
+        return delegate.getConditionProviderId();
+    }
+
+    public void setConditionProviderId(String conditionProviderId) {
+        delegate.setConditionProviderId(conditionProviderId);
+    }
+
+    public JsonNode getConfiguration() {
+        return delegate.getConfiguration();
+    }
+
+    public void setConfiguration(JsonNode configuration) {
+        delegate.setConfiguration(configuration);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (delegate.getClass() != o.getClass()) return false;
+        return delegate.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+}
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientPolicyType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientPolicyType.java
new file mode 100644
index 0000000..252c471
--- /dev/null
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientPolicyType.java
@@ -0,0 +1,79 @@
+package net.brianlevine.keycloak.graphql.types;
+
+import io.leangen.graphql.annotations.GraphQLArgument;
+import io.leangen.graphql.annotations.GraphQLQuery;
+import io.leangen.graphql.annotations.types.GraphQLType;
+import net.brianlevine.keycloak.graphql.util.Page;
+import org.keycloak.representations.idm.ClientPolicyConditionRepresentation;
+import org.keycloak.representations.idm.ClientPolicyRepresentation;
+
+import java.util.List;
+
+@GraphQLType
+@SuppressWarnings("unused")
+public class ClientPolicyType {
+    private final ClientPolicyRepresentation delegate;
+
+    public ClientPolicyType(ClientPolicyRepresentation clientPolicyRepresentation) {
+        this.delegate = clientPolicyRepresentation;
+    }
+
+    public String getName() {
+        return delegate.getName();
+    }
+
+    public void setName(String name) {
+        delegate.setName(name);
+    }
+
+    public String getDescription() {
+        return delegate.getDescription();
+    }
+
+    public void setDescription(String description) {
+        delegate.setDescription(description);
+    }
+
+    public Boolean isEnabled() {
+        return delegate.isEnabled();
+    }
+
+    public void setEnabled(Boolean enabled) {
+        delegate.setEnabled(enabled);
+    }
+
+    @GraphQLQuery
+    public Page<ClientPolicyConditionType> getConditions(@GraphQLArgument PagingOptions options) {
+        List<ClientPolicyConditionRepresentation> reps = delegate.getConditions();
+        List<ClientPolicyConditionType> conditions = reps.stream()
+                .skip(options.start)
+                .limit(options.limit)
+                .map(ClientPolicyConditionType::new)
+                .toList();
+
+        return new Page<>(reps.size(), options.limit, conditions);
+    }
+
+    public void setConditions(List<ClientPolicyConditionRepresentation> conditions) {
+        delegate.setConditions(conditions);
+    }
+
+    public List<String> getProfiles() {
+        return delegate.getProfiles();
+    }
+
+    public void setProfiles(List<String> profiles) {
+        delegate.setProfiles(profiles);
+    }
+
+    @SuppressWarnings("com.intellij.jpb.inspection.EqualsDoesntCheckParameterClassInspection")
+    @Override
+    public boolean equals(Object o) {
+        return delegate.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+}
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientProfileType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientProfileType.java
index bc0a4ff..599cbd3 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientProfileType.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientProfileType.java
@@ -1,6 +1,7 @@
 package net.brianlevine.keycloak.graphql.types;
 
 import io.leangen.graphql.annotations.GraphQLArgument;
+import io.leangen.graphql.annotations.GraphQLQuery;
 import io.leangen.graphql.annotations.types.GraphQLType;
 import net.brianlevine.keycloak.graphql.util.Page;
 import org.keycloak.representations.idm.ClientPolicyExecutorRepresentation;
@@ -34,15 +35,18 @@ public void setDescription(String description) {
         delegate.setDescription(description);
     }
 
-    public Page<ClientPolicyExecutorType> getExecutors(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    @GraphQLQuery
+    public Page<ClientPolicyExecutorType> getExecutors(PagingOptions options) {
         List<ClientPolicyExecutorRepresentation> executors = delegate.getExecutors();
+
+        options = options == null ? new PagingOptions() : options;
         List<ClientPolicyExecutorType> ets = executors.stream()
-                .skip(start)
-                .limit(limit)
+                .skip(options.start)
+                .limit(options.limit)
                 .map(ClientPolicyExecutorType::new)
                 .toList();
 
-        return new Page<>(executors.size(), limit, ets);
+        return new Page<>(executors.size(), options.limit, ets);
     }
 
     public void setExecutors(List<ClientPolicyExecutorRepresentation> executors) {
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientScopeType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientScopeType.java
index ab3a3f0..bf2e28a 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientScopeType.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ClientScopeType.java
@@ -42,14 +42,16 @@ public void setDescription(String description) {
         delegate.setDescription(description);
     }
 
-    public Page<ProtocolMapperType> getProtocolMappers(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public Page<ProtocolMapperType> getProtocolMappers(PagingOptions options) {
+        options = options == null ? new PagingOptions() : options;
+
         List<ProtocolMapperType> pms = delegate.getProtocolMappers().stream()
-                .skip(start)
-                .limit(limit)
+                .skip(options.start)
+                .limit(options.limit)
                 .map(ProtocolMapperType::new)
                 .toList();
 
-        return new Page<>(pms.size(), limit, pms);
+        return new Page<>(pms.size(), options.limit, pms);
     }
 
     public void setProtocolMappers(List<ProtocolMapperRepresentation> protocolMappers) {
@@ -64,8 +66,8 @@ public void setProtocol(String protocol) {
         delegate.setProtocol(protocol);
     }
 
-    public AttributeMap getAttributes(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
-        return new AttributeMap(delegate.getAttributes(), start, limit);
+    public AttributeMap getAttributes(PagingOptions options) {
+        return new AttributeMap(delegate.getAttributes(), options.start, options.limit);
     }
 
     public void setAttributes(Map<String, String> attributes) {
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ComponentType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ComponentType.java
index 73b43e8..3d86eed 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ComponentType.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ComponentType.java
@@ -54,10 +54,11 @@ public void setSubType(String subType) {
     }
 
     @GraphQLQuery
-    public MultiAttributeMap getConfig(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public MultiAttributeMap getConfig(PagingOptions options) {
         MultivaluedMap<String, String> config = delegate.getConfig();
+        options = options == null ? new PagingOptions() : options;
 
-        return new MultiAttributeMap(config, start, limit);
+        return new MultiAttributeMap(config, options.start, options.limit);
     }
 
 //    public void setConfig(MultivaluedHashMap<String, String> config) {
@@ -73,14 +74,14 @@ public MultiAttributeMap getConfig(@GraphQLArgument(defaultValue = "0")int start
 //    }
 
     @GraphQLQuery
-    public ComponentMap getSubComponents(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public ComponentMap getSubComponents(PagingOptions options) {
         MultivaluedHashMap<String, ComponentExportRepresentation> subComponents = delegate.getSubComponents();
 
         Map<String, List<ComponentType>> subs = subComponents != null
                 ? subComponents.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().stream().map(ComponentType::new).toList()))
                 : new MultivaluedHashMap<>();
-
-        return new ComponentMap(subs, start, limit);
+        options = options == null ? new PagingOptions() : options;
+        return new ComponentMap(subs, options.start, options.limit);
     }
 
 //    public void setSubComponents(MultivaluedHashMap<String, ComponentExportRepresentation> subComponents) {
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/GroupHolder.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/GroupHolder.java
index 6874228..5c3d7d6 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/GroupHolder.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/GroupHolder.java
@@ -12,19 +12,16 @@
 
 public interface GroupHolder extends BaseType {
     @GraphQLQuery
-    default Page<GroupType> getGroups(
-            @GraphQLArgument(defaultValue = "0") int start,
-            @GraphQLArgument(defaultValue = "100") int limit,
-            @GraphQLRootContext GraphQLContext ctx) {
-
+    default Page<GroupType> getGroups(PagingOptions options, @GraphQLRootContext GraphQLContext ctx) {
+        options = options == null ? new PagingOptions() : options;
         long totalCount = getGroupsCount(ctx);
-        Stream<GroupModel> groupModels = getGroupsStream(start, limit, ctx);
+        Stream<GroupModel> groupModels = getGroupsStream(options.start, options.limit, ctx);
 
         KeycloakSession kcSession = getKeycloakSession();
         RealmModel realmModel = getRealmModel();
         List<GroupType> groups = groupModels.map(gm -> new GroupType(kcSession, realmModel, gm)).toList();
 
-        return new Page<>((int) totalCount, limit, groups);
+        return new Page<>((int) totalCount, options.limit, groups);
     }
 
     // Note: Implementations should make these as @GraphQLIgnore
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/GroupType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/GroupType.java
index 4e25984..c6c5648 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/GroupType.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/GroupType.java
@@ -147,10 +147,7 @@ public void setAttributes(Map<String, List<String>> attributes) {
 //    }
 
     @GraphQLQuery
-    public Page<GroupType> getSubGroups(
-            @GraphQLArgument(defaultValue = "0")int start,
-            @GraphQLArgument(defaultValue = "100")int limit,
-            @GraphQLRootContext GraphQLContext ctx) {
+    public Page<GroupType> getSubGroups(PagingOptions options, @GraphQLRootContext GraphQLContext ctx) {
 
         Page<GroupType> ret;
 
@@ -165,12 +162,14 @@ public Page<GroupType> getSubGroups(
         if (eval.canView(getGroupModel())) {
             boolean canViewGlobal = eval.canView();
 
+            options = options == null ? new PagingOptions() : options;
+
             long subGroupCount = gm.getSubGroupsStream().filter(g -> canViewGlobal || eval.canView(g)).count();
-            Stream<GroupModel> groupModels = gm.getSubGroupsStream(start, limit).filter(g -> canViewGlobal || eval.canView(g));
+            Stream<GroupModel> groupModels = gm.getSubGroupsStream(options.start, options.limit).filter(g -> canViewGlobal || eval.canView(g));
 
             List<GroupType> groupTypes = groupModels.map(g -> new GroupType(session, realmModel, GroupUtils.toRepresentation(eval, g, true))).toList();
 
-            ret = new Page<>((int)subGroupCount, limit, groupTypes);
+            ret = new Page<>((int)subGroupCount, options.limit, groupTypes);
         }
         else {
             ret = Page.emptyPage();
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/OrganizationType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/OrganizationType.java
index 21b3b4c..b0d7efd 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/OrganizationType.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/OrganizationType.java
@@ -57,8 +57,10 @@ public void setDescription(String description) {
     }
 
     @GraphQLQuery
-    public MultiAttributeMap getAttributes(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
-        return new MultiAttributeMap(delegate.getAttributes(), start, limit);
+    public MultiAttributeMap getAttributes(PagingOptions options) {
+        options = options == null ? new PagingOptions() : options;
+
+        return new MultiAttributeMap(delegate.getAttributes(), options.start, options.limit);
     }
 //
 //    public void setAttributes(Map<String, List<String>> attributes) {
@@ -72,9 +74,11 @@ public MultiAttributeMap getAttributes(@GraphQLArgument(defaultValue = "0")int s
 //        return delegate;
 //    }
 
-    public Page<OrganizationDomainType> getDomains(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public Page<OrganizationDomainType> getDomains(PagingOptions options) {
         Set<OrganizationDomainRepresentation> domains =  delegate.getDomains();
-        return new Page<>(domains.size(), limit, domains.stream().skip(start).limit(limit).map(OrganizationDomainType::new).toList());
+        options = options == null ? new PagingOptions() : options;
+
+        return new Page<>(domains.size(), options.limit, domains.stream().skip(options.start).limit(options.limit).map(OrganizationDomainType::new).toList());
     }
 
     public OrganizationDomainType getDomain(String name) {
@@ -93,15 +97,18 @@ public OrganizationDomainType getDomain(String name) {
 //        getDomains().remove(domain);
 //    }
 
-    public Page<UserType> getMembers(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public Page<UserType> getMembers(PagingOptions options) {
         List<UserRepresentation> members =  delegate.getMembers();
+
+        options = options == null ? new PagingOptions() : options;
+
         List<UserType> users = members.stream()
-                .skip(start)
-                .limit(limit)
+                .skip(options.start)
+                .limit(options.limit)
                 .map(u -> new UserType(kcSession, kcSession.getContext().getRealm(), u))
                 .toList();
 
-        return new Page<>(members.size(), limit, users);
+        return new Page<>(members.size(), options.limit, users);
     }
 
 //    public void setMembers(List<UserRepresentation> members) {
@@ -115,15 +122,16 @@ public Page<UserType> getMembers(@GraphQLArgument(defaultValue = "0")int start,
 //        delegate.getMembers().add(user);
 //    }
 
-    public Page<IdentityProviderType> getIdentityProviders(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public Page<IdentityProviderType> getIdentityProviders(PagingOptions options) {
         List<IdentityProviderRepresentation> identityProviders =  delegate.getIdentityProviders();
+        options = options == null ? new PagingOptions() : options;
         List<IdentityProviderType> idps = identityProviders.stream()
-                .skip(start)
-                .limit(limit)
+                .skip(options.start)
+                .limit(options.limit)
                 .map(IdentityProviderType::new)
                 .toList();
 
-        return new Page<>(identityProviders.size(), limit, idps);
+        return new Page<>(identityProviders.size(), options.limit, idps);
     }
 
 //    public void setIdentityProviders(List<IdentityProviderRepresentation> identityProviders) {
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/StdCollectionArgs.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/PagingOptions.java
similarity index 63%
rename from graphql/src/main/java/net/brianlevine/keycloak/graphql/types/StdCollectionArgs.java
rename to graphql/src/main/java/net/brianlevine/keycloak/graphql/types/PagingOptions.java
index b160046..aba372a 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/StdCollectionArgs.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/PagingOptions.java
@@ -2,18 +2,22 @@
 
 import io.leangen.graphql.annotations.GraphQLInputField;
 import io.leangen.graphql.annotations.types.GraphQLType;
+import io.leangen.graphql.execution.SortField;
 import net.brianlevine.keycloak.graphql.annotations.GraphQLOverrideTypeName;
 
-
 @GraphQLOverrideTypeName
-@GraphQLType(name = "PagingConfig", description = "Standard arguments for controlling the paging behavior of collections.")
-public class StdCollectionArgs {
+@GraphQLType(name = "PagingOptions")
+public class PagingOptions {
+
     @GraphQLInputField(defaultValue="0")
     public int start = 0;
 
     @GraphQLInputField(defaultValue="100")
     public int limit = 100;
 
-    @GraphQLInputField(defaultValue="null")
-    public String[] sort = null;
+    @GraphQLInputField(defaultValue="[]", description="** Not yet supported **")
+    public SortField[] sort = null;
+
+
 }
+
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ProtocolMapperType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ProtocolMapperType.java
index 26f95eb..bd61bfc 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ProtocolMapperType.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/ProtocolMapperType.java
@@ -47,9 +47,11 @@ public void setProtocolMapper(String protocolMapper) {
         delegate.setProtocolMapper(protocolMapper);
     }
 
-    public AttributeMap getConfig(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public AttributeMap getConfig(PagingOptions options) {
+        options = options == null ? new PagingOptions() : options;
 
-        return new AttributeMap(delegate.getConfig(), start, limit);
+
+        return new AttributeMap(delegate.getConfig(), options.start, options.limit);
     }
 
     public void setConfig(Map<String, String> config) {
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RealmType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RealmType.java
index 1fda0c0..b787d61 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RealmType.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RealmType.java
@@ -21,6 +21,7 @@
 import org.keycloak.models.utils.KeycloakModelUtils;
 import org.keycloak.models.utils.ModelToRepresentation;
 import org.keycloak.representations.idm.ClientPoliciesRepresentation;
+import org.keycloak.representations.idm.ClientPolicyRepresentation;
 import org.keycloak.representations.idm.ClientProfileRepresentation;
 import org.keycloak.representations.idm.ClientProfilesRepresentation;
 import org.keycloak.representations.idm.ComponentExportRepresentation;
@@ -44,7 +45,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-
 @GraphQLType
 @SuppressWarnings("unused")
 public class RealmType implements Container, GroupHolder, RoleHolder, BaseType {
@@ -162,17 +162,18 @@ public void setDisplayNameHtml(String displayNameHtml) {
     }
 
     @GraphQLQuery
-    //public Page<UserType> getUsers(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit, @GraphQLRootContext GraphQLContext ctx) {
-    public Page<UserType> getUsers(@GraphQLArgument(name="args") StdCollectionArgs collectionArgs,  @GraphQLRootContext GraphQLContext ctx) {
+    public Page<UserType> getUsers(PagingOptions options, @GraphQLRootContext GraphQLContext ctx) {
         RealmModel realm = kcSession.realms().getRealm(getId());
         UserPermissionEvaluator eval = Auth.getAdminPermissionEvaluator(ctx, getRealmModel()).users();
 
-        Stream<UserModel> userModels = kcSession.users().searchForUserStream(realm, Collections.emptyMap(), collectionArgs.start, collectionArgs.limit);
+        options = options == null ? new PagingOptions() : options;
+
+        Stream<UserModel> userModels = kcSession.users().searchForUserStream(realm, Collections.emptyMap(), options.start, options.limit);
         Stream<UserRepresentation> userReps =  RealmType.toUserRepresentation(kcSession, realm, eval, userModels);
         List<UserType> userTypes = userReps.map(u -> new UserType(kcSession, realm, u)).toList();
 
         int userCount = userTypes.size();
-        Page<UserType> page = new Page<>(userCount, collectionArgs.limit, userTypes);
+        Page<UserType> page = new Page<>(userCount, options.limit, userTypes);
 
         return page;
     }
@@ -287,12 +288,12 @@ public static Stream<UserRepresentation> toUserRepresentation(KeycloakSession se
     }
 
     @GraphQLQuery
-    public Page<ClientType> getClients(@GraphQLArgument(defaultValue = "0") int start, @GraphQLArgument(defaultValue = "100") int limit) {
-        Stream<ClientModel> clientModels = getRealmModel().getClientsStream(start, limit);
+    public Page<ClientType> getClients(@GraphQLArgument PagingOptions options) {
+        Stream<ClientModel> clientModels = getRealmModel().getClientsStream(options.start, options.limit);
         List<ClientType> clients = clientModels.map(c -> new ClientType(getKeycloakSession(), getRealmModel(), c)).toList();
         long count = getRealmModel().getClientsCount();
 
-        return new Page<>((int)count, limit, clients);
+        return new Page<>((int)count, options.limit, clients);
     }
 
 
@@ -562,7 +563,7 @@ public RoleType getDefaultRole() {
 
     // TODO: Optimize with SQL query rather than iterating over groups by name
     @GraphQLQuery
-    public Page<GroupType> getDefaultGroups(@GraphQLArgument(defaultValue = "0") int start, @GraphQLArgument(defaultValue = "100") int limit, @GraphQLRootContext GraphQLContext ctx) {
+    public Page<GroupType> getDefaultGroups(@GraphQLArgument PagingOptions options, @GraphQLRootContext GraphQLContext ctx) {
         AdminPermissionEvaluator auth = Auth.getAdminPermissionEvaluator(ctx.get("headers"), getKeycloakSession(), getRealmModel());
 
         if (auth.realm().canViewRealm()) {
@@ -572,10 +573,10 @@ public Page<GroupType> getDefaultGroups(@GraphQLArgument(defaultValue = "0") int
             Stream<GroupModel> groups = realm.getDefaultGroupsStream();
             long count = groups.count();
 
-            groups = realm.getDefaultGroupsStream().skip(start).limit(limit);
+            groups = realm.getDefaultGroupsStream().skip(options.start).limit(options.limit);
             List<GroupType> groupTypes = groups.map(g -> new GroupType(session, realm, g)).toList();
 
-            return new Page<>((int)count, limit, groupTypes);
+            return new Page<>((int)count, options.limit, groupTypes);
         }
         else {
             return Page.emptyPage();
@@ -1343,38 +1344,64 @@ public void setWebAuthnPolicyPasswordlessExtraOrigins(List<String> extraOrigins)
 
 
     @GraphQLQuery
-    public Page<ClientProfileType> getClientProfiles(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100") int limit) {
+    public Page<ClientProfileType> getClientProfiles(@GraphQLArgument PagingOptions options) {
         Page<ClientProfileType> ret = Page.emptyPage();
 
         ClientProfilesRepresentation rep = delegate.getParsedClientProfiles();
 
         if (rep != null) {
             List<ClientProfileRepresentation> profiles = rep.getProfiles();
-            List<ClientProfileType> cpt = profiles.stream().skip(start).limit(limit).map(ClientProfileType::new).toList();
-            ret = new Page<>(profiles.size(), limit, cpt);
+            List<ClientProfileType> cpt = profiles.stream().skip(options.start).limit(options.limit).map(ClientProfileType::new).toList();
+            ret = new Page<>(profiles.size(), options.limit, cpt);
         }
 
         return ret;
     }
 
     @GraphQLQuery
-    public Page<ClientProfileType> getGlobalClientProfiles(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100") int limit) {
+    public Page<ClientProfileType> getGlobalClientProfiles(@GraphQLArgument PagingOptions options) {
         Page<ClientProfileType> ret = Page.emptyPage();
-
         ClientProfilesRepresentation rep = delegate.getParsedClientProfiles();
 
         if (rep != null) {
             List<ClientProfileRepresentation> profiles = rep.getGlobalProfiles();
-            List<ClientProfileType> cpt = profiles.stream().skip(start).limit(limit).map(ClientProfileType::new).toList();
-            ret = new Page<>(profiles.size(), limit, cpt);
+            List<ClientProfileType> cpt = profiles.stream().skip(options.start).limit(options.limit).map(ClientProfileType::new).toList();
+            ret = new Page<>(profiles.size(), options.limit, cpt);
         }
 
         return ret;
     }
 
-    public ClientPoliciesRepresentation getParsedClientPolicies() {
-        return delegate.getParsedClientPolicies();
+    @GraphQLQuery
+    public Page<ClientPolicyType> getClientPolicies(@GraphQLArgument PagingOptions options) {
+        Page<ClientPolicyType> ret = Page.emptyPage();
+        ClientPoliciesRepresentation rep = delegate.getParsedClientPolicies();
+
+        if (rep != null) {
+            List<ClientPolicyRepresentation> policies = rep.getPolicies();
+            List<ClientPolicyType> cpt = policies.stream().skip(options.start).limit(options.limit).map(ClientPolicyType::new).toList();
+            ret = new Page<>(policies.size(), options.limit, cpt);
+        }
+
+        return ret;
     }
+
+    public Page<ClientPolicyType> getGlobalClientPolicies(@GraphQLArgument PagingOptions options) {
+        Page<ClientPolicyType> ret = Page.emptyPage();
+        ClientPoliciesRepresentation rep = delegate.getParsedClientPolicies();
+
+        if (rep != null) {
+            List<ClientPolicyRepresentation> policies = rep.getGlobalPolicies();
+            List<ClientPolicyType> cpt = policies.stream().skip(options.start).limit(options.limit).map(ClientPolicyType::new).toList();
+            ret = new Page<>(policies.size(), options.limit, cpt);
+        }
+
+        return ret;
+    }
+
+//    public ClientPoliciesRepresentation getParsedClientPolicies() {
+//        return delegate.getParsedClientPolicies();
+//    }
 //
 //
 //    public void setParsedClientPolicies(ClientPoliciesRepresentation clientPolicies) {
@@ -1461,9 +1488,9 @@ public void setKeycloakVersion(String keycloakVersion) {
         delegate.setKeycloakVersion(keycloakVersion);
     }
 
-    public Page<ClientScopeType> getClientScopes(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
-        List<ClientScopeType> clientScopes = delegate.getClientScopes().stream().skip(start).limit(limit).map(ClientScopeType::new).toList();
-        return new Page<>(clientScopes.size(), limit, clientScopes);
+    public Page<ClientScopeType> getClientScopes(@GraphQLArgument PagingOptions options) {
+        List<ClientScopeType> clientScopes = delegate.getClientScopes().stream().skip(options.start).limit(options.limit).map(ClientScopeType::new).toList();
+        return new Page<>(clientScopes.size(), options.limit, clientScopes);
     }
 
 //    public void setClientScopes(List<ClientScopeRepresentation> clientScopes) {
@@ -1496,14 +1523,14 @@ public Page<ClientScopeType> getClientScopes(@GraphQLArgument(defaultValue = "0"
 //    }
 
     @GraphQLQuery
-    public ComponentMap getComponents(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public ComponentMap getComponents(@GraphQLArgument PagingOptions options) {
         RealmModel realm = getRealmModel();
         MultivaluedHashMap<String, ComponentExportRepresentation> components = ExportUtils.exportComponents(realm, realm.getId());
 
         Map<String, List<ComponentType>> comps = components.entrySet().stream()
                 .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().stream().map(ComponentType::new).toList()));
 
-        return new ComponentMap(comps, start, limit);
+        return new ComponentMap(comps, options.start, options.limit);
     }
 
 //
@@ -1523,22 +1550,22 @@ public void setAttributes(Map<String, String> attributes) {
 
 
     @GraphQLQuery
-    public AttributeMap getAttributes(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
-        return new AttributeMap(delegate.getAttributes(), start, limit);
+    public AttributeMap getAttributes(@GraphQLArgument PagingOptions options) {
+        return new AttributeMap(delegate.getAttributes(), options.start, options.limit);
     }
 
 
 
     @GraphQLQuery
-    public Page<UserType> getFederatedUsers(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public Page<UserType> getFederatedUsers(@GraphQLArgument PagingOptions options) {
         List<UserRepresentation> federatedUsers = delegate.getFederatedUsers();
         List<UserType> users = federatedUsers.stream()
-                .skip(start)
-                .limit(limit)
+                .skip(options.start)
+                .limit(options.limit)
                 .map(f -> new UserType(getKeycloakSession(), getRealmModel(), f))
                 .toList();
 
-        return new Page<>(federatedUsers.size(), limit, users);
+        return new Page<>(federatedUsers.size(), options.limit, users);
     }
 //
 //
@@ -1571,12 +1598,11 @@ public Map<String, String> getAttributesOrEmpty() {
         return delegate.getAttributesOrEmpty();
     }
 
-
-    public Page<OrganizationType> getOrganizations(@GraphQLArgument(defaultValue = "0")int start, @GraphQLArgument(defaultValue = "100")int limit) {
+    public Page<OrganizationType> getOrganizations(@GraphQLArgument PagingOptions options) {
         List<OrganizationRepresentation> organizations = delegate.getOrganizations();
-        List<OrganizationType> organizationTypes = organizations.stream().skip(start).limit(100).map(o -> new OrganizationType(getKeycloakSession(), o)).toList();
+        List<OrganizationType> organizationTypes = organizations.stream().skip(options.start).limit(options.limit).map(o -> new OrganizationType(getKeycloakSession(), o)).toList();
 
-        return new Page<>(organizations.size(), limit, organizationTypes);
+        return new Page<>(organizations.size(), options.limit, organizationTypes);
     }
 //
 //
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RoleHolder.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RoleHolder.java
index 9fd3207..b36a263 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RoleHolder.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RoleHolder.java
@@ -15,13 +15,10 @@
 public interface RoleHolder extends BaseType {
 
     @GraphQLQuery
-    default Page<RoleType> getRoles(
-            @GraphQLArgument(defaultValue = "0") int start,
-            @GraphQLArgument(defaultValue = "100") int limit,
-            @GraphQLRootContext GraphQLContext ctx) {
+    default Page<RoleType> getRoles(PagingOptions options, @GraphQLRootContext GraphQLContext ctx) {
 
         long count = getRolesCount(ctx);
-        Stream<RoleModel> roles = getRolesStream(start, limit, ctx);
+        Stream<RoleModel> roles = getRolesStream(options.start, options.limit, ctx);
 
 
         List<RoleType> roleTypes = roles.map(r -> {
@@ -29,7 +26,7 @@ default Page<RoleType> getRoles(
             return new RoleType(getKeycloakSession(), getRealmModel(), roleRep);
         }).toList();
 
-        return new Page<>((int) count, limit, roleTypes);
+        return new Page<>((int) count, options.limit, roleTypes);
     }
 
     // Note: Implementations should make these as @GraphQLIgnore
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RoleType.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RoleType.java
index f697224..9e1f81f 100644
--- a/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RoleType.java
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/types/RoleType.java
@@ -92,7 +92,7 @@ public void setDescription(String description) {
     }
 
     @GraphQLQuery(name = "compositeRoles")
-    public Page<RoleType> getComposites(@GraphQLArgument(defaultValue = "0") int start, @GraphQLArgument(defaultValue = "100") int limit) {
+    public Page<RoleType> getComposites(PagingOptions options) {
         JpaConnectionProvider connection = kcSession.getProvider(JpaConnectionProvider.class);
         EntityManager em = connection.getEntityManager();
 
@@ -105,11 +105,12 @@ public Page<RoleType> getComposites(@GraphQLArgument(defaultValue = "0") int sta
 //
 //        long count = (long)q.getSingleResult();
 
+        options = options == null ? new PagingOptions() : options;
         long count = getRoleModel().getCompositesStream().count();
-        Stream<RoleModel> composites = getRoleModel().getCompositesStream(null, start, limit);
+        Stream<RoleModel> composites = getRoleModel().getCompositesStream(null, options.start, options.limit);
         List<RoleType> items = composites.map(c -> new RoleType(kcSession, realm, c)).toList();
 
-        return new Page<>((int)count, limit, items);
+        return new Page<>((int)count, options.limit, items);
     }
 
 
diff --git a/graphql/src/main/java/net/brianlevine/keycloak/graphql/util/MyAnnotedArgumentBuilder.java b/graphql/src/main/java/net/brianlevine/keycloak/graphql/util/MyAnnotedArgumentBuilder.java
new file mode 100644
index 0000000..7bf850f
--- /dev/null
+++ b/graphql/src/main/java/net/brianlevine/keycloak/graphql/util/MyAnnotedArgumentBuilder.java
@@ -0,0 +1,15 @@
+package net.brianlevine.keycloak.graphql.util;
+
+import io.leangen.graphql.execution.GlobalEnvironment;
+import io.leangen.graphql.metadata.DefaultValue;
+import io.leangen.graphql.metadata.strategy.query.AnnotatedArgumentBuilder;
+
+import java.lang.reflect.AnnotatedType;
+import java.lang.reflect.Parameter;
+
+public class MyAnnotedArgumentBuilder extends AnnotatedArgumentBuilder {
+    @Override
+    protected DefaultValue defaultValue(Parameter parameter, AnnotatedType parameterType, GlobalEnvironment environment) {
+        return super.defaultValue(parameter, parameterType, environment);
+    }
+}