diff --git a/actions.go b/actions.go
index a2e8c9bc..a5bca142 100644
--- a/actions.go
+++ b/actions.go
@@ -21,9 +21,8 @@ func (customActionsTriggerDefinition *CustomActionsTriggerDefinition) ExtendedTe
 	if customActionsTriggerDefinition.Id == "" {
 		return nil, fmt.Errorf("unable to get teams with ExtendedTeamAccess, invalid CustomActionsTriggerDefinition id: '%s'", customActionsTriggerDefinition.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["input"] = *NewIdentifier(string(customActionsTriggerDefinition.Id))
 
 	if err := client.Query(&q, *variables, WithName("ExtendedTeamAccessList")); err != nil {
@@ -96,9 +95,8 @@ func (client *Client) ListCustomActions(variables *PayloadVariables) (*CustomAct
 			Actions CustomActionsExternalActionsConnection `graphql:"customActionsExternalActions(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("ExternalActionList")); err != nil {
 		return nil, err
 	}
@@ -175,9 +173,8 @@ func (client *Client) ListTriggerDefinitions(variables *PayloadVariables) (*Cust
 			Definitions CustomActionsTriggerDefinitionsConnection `graphql:"customActionsTriggerDefinitions(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("TriggerDefinitionList")); err != nil {
 		return nil, HandleErrors(err)
 	}
diff --git a/category.go b/category.go
index 5213fa70..d5227f84 100644
--- a/category.go
+++ b/category.go
@@ -55,9 +55,8 @@ func (client *Client) ListCategories(variables *PayloadVariables) (*CategoryConn
 			}
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("CategoryList")); err != nil {
 		return nil, err
 	}
diff --git a/check.go b/check.go
index 04235b9d..b3297ab2 100644
--- a/check.go
+++ b/check.go
@@ -196,9 +196,8 @@ func (client *Client) ListChecks(variables *PayloadVariables) (*CheckConnection,
 			}
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("CheckList")); err != nil {
 		return nil, err
 	}
diff --git a/clientGQL.go b/clientGQL.go
index 348d9d58..c5ca05d2 100644
--- a/clientGQL.go
+++ b/clientGQL.go
@@ -100,3 +100,11 @@ func (client *Client) Validate() error {
 func WithName(name string) graphql.Option {
 	return graphql.OperationName(name)
 }
+
+func (client *Client) PopulatePaginationParams(variables *PayloadVariables) *PayloadVariables {
+	if variables == nil {
+		variables = client.InitialPageVariablesPointer()
+	}
+
+	return (*PayloadVariables)(MergeMaps((*variables), client.InitialPageVariables()))
+}
diff --git a/common.go b/common.go
index 9fed0a23..a0ad4d1d 100644
--- a/common.go
+++ b/common.go
@@ -93,3 +93,19 @@ func extractAliases(existingAliases, aliasesWanted []string) ([]string, []string
 type Connection interface {
 	GetNodes() any
 }
+
+func MergeMaps(map1, map2 map[string]any) *map[string]any {
+	merged := make(map[string]any)
+
+	for key, value := range map1 {
+		merged[key] = value
+	}
+
+	for key, value := range map2 {
+		if _, present := merged[key]; !present {
+			merged[key] = value
+		}
+	}
+
+	return &merged
+}
diff --git a/component.go b/component.go
index b2daca43..96402c7b 100644
--- a/component.go
+++ b/component.go
@@ -27,9 +27,8 @@ func (s *ComponentType) GetProperties(client *Client, v *PayloadVariables) (*Pro
 	if s.Id == "" {
 		return nil, fmt.Errorf("unable to get properties, invalid id: '%s'", s.Id)
 	}
-	if v == nil {
-		v = client.InitialPageVariablesPointer()
-	}
+
+	v = client.PopulatePaginationParams(v)
 	(*v)["input"] = *NewIdentifier(string(s.Id))
 	if err := client.Query(&q, *v, WithName("ComponentTypePropertyList")); err != nil {
 		return nil, err
@@ -90,9 +89,8 @@ func (client *Client) ListComponentTypes(variables *PayloadVariables) (*Componen
 			ComponentTypes ComponentTypeConnection `graphql:"componentTypes(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("ComponentTypeList")); err != nil {
 		return nil, err
 	}
diff --git a/dependencies.go b/dependencies.go
index acaf29be..d7cc5c26 100644
--- a/dependencies.go
+++ b/dependencies.go
@@ -55,9 +55,8 @@ func (service *Service) GetDependencies(client *Client, variables *PayloadVariab
 	if service.Id == "" {
 		return nil, fmt.Errorf("unable to get Dependencies, invalid service id: '%s'", service.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["service"] = service.Id
 	if err := client.Query(&q, *variables, WithName("ServiceDependenciesList")); err != nil {
 		return nil, err
@@ -88,9 +87,8 @@ func (service *Service) GetDependents(client *Client, variables *PayloadVariable
 	if service.Id == "" {
 		return nil, fmt.Errorf("unable to get Dependents, invalid service id: '%s'", service.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["service"] = service.Id
 	if err := client.Query(&q, *variables, WithName("ServiceDependentsList")); err != nil {
 		return nil, err
diff --git a/document.go b/document.go
index 7f3f4e28..46502348 100644
--- a/document.go
+++ b/document.go
@@ -35,9 +35,7 @@ func (client *Client) ListDocuments(variables *PayloadVariables) (*ServiceDocume
 		}
 	}
 
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+	variables = client.PopulatePaginationParams(variables)
 
 	if (*variables)["searchTerm"] == nil {
 		(*variables)["searchTerm"] = ""
diff --git a/domain.go b/domain.go
index 139482b2..01076abc 100644
--- a/domain.go
+++ b/domain.go
@@ -56,9 +56,8 @@ func (domainId *DomainId) GetTags(client *Client, variables *PayloadVariables) (
 	if domainId.Id == "" {
 		return nil, fmt.Errorf("unable to get Tags, invalid domain id: '%s'", domainId.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["domain"] = *NewIdentifier(string(domainId.Id))
 
 	if err := client.Query(&q, *variables, WithName("DomainTagsList")); err != nil {
@@ -109,10 +108,8 @@ func (domainId *DomainId) ChildSystems(client *Client, variables *PayloadVariabl
 	if domainId.Id == "" {
 		return nil, fmt.Errorf("unable to get Systems, invalid domain id: '%s'", domainId.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
 
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["domain"] = *NewIdentifier(string(domainId.Id))
 
 	if err := client.Query(&q, *variables, WithName("DomainChildSystemsList")); err != nil {
@@ -173,9 +170,8 @@ func (client *Client) ListDomains(variables *PayloadVariables) (*DomainConnectio
 			Domains DomainConnection `graphql:"domains(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("DomainsList")); err != nil {
 		return nil, err
 	}
diff --git a/filters.go b/filters.go
index 41469d9c..8fbd15e6 100644
--- a/filters.go
+++ b/filters.go
@@ -226,9 +226,8 @@ func (client *Client) ListFilters(variables *PayloadVariables) (*FilterConnectio
 			Filters FilterConnection `graphql:"filters(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("FilterList")); err != nil {
 		return nil, err
 	}
diff --git a/infra.go b/infra.go
index db60446d..5440153a 100644
--- a/infra.go
+++ b/infra.go
@@ -87,9 +87,8 @@ func (infrastructureResource *InfrastructureResource) GetTags(client *Client, va
 	if infrastructureResource.Id == "" {
 		return nil, fmt.Errorf("unable to get Tags, invalid InfrastructureResource id: '%s'", infrastructureResource.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["infrastructureResource"] = *NewIdentifier(string(infrastructureResource.Id))
 
 	if err := client.Query(&q, *variables, WithName("InfrastructureResourceTags")); err != nil {
@@ -180,9 +179,8 @@ func (client *Client) ListInfrastructureSchemas(variables *PayloadVariables) (*I
 			InfrastructureResourceSchemas InfrastructureResourceSchemaConnection `graphql:"infrastructureResourceSchemas(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("InfrastructureResourceSchemaList")); err != nil {
 		return nil, err
 	}
diff --git a/integration.go b/integration.go
index ea824f6b..c4ac2820 100644
--- a/integration.go
+++ b/integration.go
@@ -129,9 +129,8 @@ func (client *Client) ListIntegrations(variables *PayloadVariables) (*Integratio
 			Integrations IntegrationConnection `graphql:"integrations(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("IntegrationList")); err != nil {
 		return nil, err
 	}
diff --git a/maturity.go b/maturity.go
index c81b8e05..8074e2de 100644
--- a/maturity.go
+++ b/maturity.go
@@ -51,9 +51,8 @@ func (client *Client) ListServicesMaturity(variables *PayloadVariables) (*Servic
 			Services ServiceMaturityConnection `graphql:"services(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("ServiceMaturityList")); err != nil {
 		return nil, err
 	}
diff --git a/property.go b/property.go
index 3fc32b51..8cf86499 100644
--- a/property.go
+++ b/property.go
@@ -87,9 +87,8 @@ func (client *Client) ListPropertyDefinitions(variables *PayloadVariables) (*Pro
 			Definitions PropertyDefinitionConnection `graphql:"propertyDefinitions(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("PropertyDefinitionList")); err != nil {
 		return nil, err
 	}
@@ -166,9 +165,8 @@ func (service *Service) GetProperties(client *Client, variables *PayloadVariable
 	if service.Id == "" {
 		return nil, fmt.Errorf("unable to get properties, invalid Service id: '%s'", service.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["service"] = service.Id
 	if err := client.Query(&q, *variables, WithName("ServicePropertiesList")); err != nil {
 		return nil, err
diff --git a/repository.go b/repository.go
index b9e632b2..f0193eca 100644
--- a/repository.go
+++ b/repository.go
@@ -128,9 +128,8 @@ func (repository *Repository) GetServices(client *Client, variables *PayloadVari
 	if repository.Id == "" {
 		return nil, fmt.Errorf("unable to get Services, invalid repository id: '%s'", repository.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["id"] = repository.Id
 	if err := client.Query(&q, *variables, WithName("RepositoryServicesList")); err != nil {
 		return nil, err
@@ -162,9 +161,8 @@ func (repository *Repository) GetTags(client *Client, variables *PayloadVariable
 	if repository.Id == "" {
 		return nil, fmt.Errorf("unable to get Tags, invalid repository id: '%s'", repository.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["id"] = repository.Id
 	if err := client.Query(&q, *variables, WithName("RepositoryTagsList")); err != nil {
 		return nil, err
@@ -285,9 +283,8 @@ func (client *Client) ListRepositoriesWithTier(tier string, variables *PayloadVa
 			Repositories RepositoryConnection `graphql:"repositories(tierAlias: $tier, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["tier"] = tier
 	if err := client.Query(&q, *variables, WithName("RepositoryListWithTier")); err != nil {
 		return &q.Account.Repositories, err
diff --git a/scorecards.go b/scorecards.go
index 359b6c01..f6c33a81 100644
--- a/scorecards.go
+++ b/scorecards.go
@@ -58,9 +58,8 @@ func (scorecard *Scorecard) ListCategories(client *Client, variables *PayloadVar
 			} `graphql:"scorecard(input: $scorecard)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["scorecard"] = *NewIdentifier(string(scorecard.Id))
 	if err := client.Query(&q, *variables, WithName("ScorecardCategoryList")); err != nil {
 		return nil, err
@@ -116,9 +115,8 @@ func (client *Client) ListScorecards(variables *PayloadVariables) (*ScorecardCon
 			Scorecards ScorecardConnection `graphql:"scorecards(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("ScorecardsList")); err != nil {
 		return nil, err
 	}
diff --git a/secrets.go b/secrets.go
index f6b94714..506d4caf 100644
--- a/secrets.go
+++ b/secrets.go
@@ -24,9 +24,8 @@ func (client *Client) ListSecretsVaultsSecret(variables *PayloadVariables) (*Sec
 			SecretsVaultsSecrets SecretsVaultsSecretConnection `graphql:"secretsVaultsSecrets(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("SecretList")); err != nil {
 		return nil, err
 	}
diff --git a/service.go b/service.go
index e057fc25..6f874df2 100644
--- a/service.go
+++ b/service.go
@@ -178,9 +178,8 @@ func (service *Service) GetTags(client *Client, variables *PayloadVariables) (*T
 	if service.Id == "" {
 		return nil, fmt.Errorf("unable to get Tags, invalid service id: '%s'", service.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["service"] = service.Id
 	if err := client.Query(&q, *variables, WithName("ServiceTagsList")); err != nil {
 		return nil, err
@@ -221,9 +220,8 @@ func (service *Service) GetTools(client *Client, variables *PayloadVariables) (*
 	if service.Id == "" {
 		return nil, fmt.Errorf("unable to get Tools, invalid service id: '%s'", service.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["service"] = service.Id
 	if err := client.Query(&q, *variables, WithName("ServiceToolsList")); err != nil {
 		return nil, err
@@ -256,9 +254,8 @@ func (service *Service) GetRepositories(client *Client, variables *PayloadVariab
 	if service.Id == "" {
 		return nil, fmt.Errorf("unable to get Repositories, invalid service id: '%s'", service.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["service"] = service.Id
 	if err := client.Query(&q, *variables, WithName("ServiceRepositoriesList")); err != nil {
 		return nil, err
@@ -292,9 +289,8 @@ func (service *Service) GetDocuments(client *Client, variables *PayloadVariables
 		return nil, fmt.Errorf("unable to get 'Documents', invalid service id: '%s'", service.Id)
 	}
 
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+	variables = client.PopulatePaginationParams(variables)
+
 	if (*variables)["searchTerm"] == nil {
 		(*variables)["searchTerm"] = ""
 	}
@@ -406,10 +402,8 @@ func (client *Client) ListServices(variables *PayloadVariables) (*ServiceConnect
 			Services ServiceConnection `graphql:"services(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
 
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("ServiceList")); err != nil {
 		return nil, err
 	}
@@ -441,9 +435,8 @@ func (client *Client) ListServicesWithFilter(filterIdentifier string, variables
 			Services ServiceConnection `graphql:"services(filterIdentifier: $filter, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["filter"] = NewIdentifier(filterIdentifier)
 
 	if err := client.Query(&q, *variables, WithName("ServiceListWithFilter")); err != nil {
@@ -474,9 +467,8 @@ func (client *Client) ListServicesWithFramework(framework string, variables *Pay
 			Services ServiceConnection `graphql:"services(framework: $framework, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["framework"] = framework
 
 	if err := client.Query(&q, *variables, WithName("ServiceListWithFramework")); err != nil {
@@ -507,9 +499,8 @@ func (client *Client) ListServicesWithLanguage(language string, variables *Paylo
 			Services ServiceConnection `graphql:"services(language: $language, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["language"] = language
 
 	if err := client.Query(&q, *variables, WithName("ServiceListWithLanguage")); err != nil {
@@ -540,9 +531,8 @@ func (client *Client) ListServicesWithLifecycle(lifecycle string, variables *Pay
 			Services ServiceConnection `graphql:"services(lifecycleAlias: $lifecycle, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["lifecycle"] = lifecycle
 
 	if err := client.Query(&q, *variables, WithName("ServiceListWithLifecycle")); err != nil {
@@ -573,9 +563,8 @@ func (client *Client) ListServicesWithOwner(owner string, variables *PayloadVari
 			Services ServiceConnection `graphql:"services(ownerAlias: $owner, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["owner"] = owner
 
 	if err := client.Query(&q, *variables, WithName("ServiceListWithOwner")); err != nil {
@@ -606,9 +595,8 @@ func (client *Client) ListServicesWithProduct(product string, variables *Payload
 			Services ServiceConnection `graphql:"services(product: $product, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["product"] = product
 
 	if err := client.Query(&q, *variables, WithName("ServiceListWithProduct")); err != nil {
@@ -656,9 +644,8 @@ func (client *Client) ListServicesWithTag(tag TagArgs, variables *PayloadVariabl
 			Services ServiceConnection `graphql:"services(tag: $tag, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["tag"] = tag
 
 	if err := client.Query(&q, *variables, WithName("ServiceListWithTag")); err != nil {
@@ -689,9 +676,8 @@ func (client *Client) ListServicesWithTier(tier string, variables *PayloadVariab
 			Services ServiceConnection `graphql:"services(tierAlias: $tier, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["tier"] = tier
 
 	if err := client.Query(&q, *variables, WithName("ServiceListWithTier")); err != nil {
diff --git a/system.go b/system.go
index 863d1a24..b3809d3c 100644
--- a/system.go
+++ b/system.go
@@ -27,9 +27,8 @@ func (systemId *SystemId) GetTags(client *Client, variables *PayloadVariables) (
 	if systemId.Id == "" {
 		return nil, fmt.Errorf("unable to get Tags, invalid system id: '%s'", systemId.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["system"] = *NewIdentifier(string(systemId.Id))
 
 	if err := client.Query(&q, *variables, WithName("SystemTagsList")); err != nil {
@@ -108,10 +107,8 @@ func (systemId *SystemId) ChildServices(client *Client, variables *PayloadVariab
 	if systemId.Id == "" {
 		return nil, fmt.Errorf("unable to get Services, invalid system id: '%s'", systemId.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
 
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["system"] = *NewIdentifier(string(systemId.Id))
 
 	if err := client.Query(&q, *variables, WithName("SystemChildServicesList")); err != nil {
@@ -172,9 +169,8 @@ func (client *Client) ListSystems(variables *PayloadVariables) (*SystemConnectio
 			Systems SystemConnection `graphql:"systems(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("SystemsList")); err != nil {
 		return nil, err
 	}
diff --git a/team.go b/team.go
index d065fd83..c61f7861 100644
--- a/team.go
+++ b/team.go
@@ -136,9 +136,8 @@ func (team *Team) GetMemberships(client *Client, variables *PayloadVariables) (*
 			} `graphql:"team(id: $team)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["team"] = team.Id
 	if err := client.Query(&q, *variables, WithName("TeamMembersList")); err != nil {
 		return nil, err
@@ -171,9 +170,8 @@ func (team *Team) GetTags(client *Client, variables *PayloadVariables) (*TagConn
 	if team.Id == "" {
 		return nil, fmt.Errorf("unable to get Tags, invalid team id: '%s'", team.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["team"] = team.Id
 	if err := client.Query(&q, *variables, WithName("TeamTagsList")); err != nil {
 		return nil, err
@@ -357,10 +355,8 @@ func (client *Client) ListTeams(variables *PayloadVariables) (*TeamConnection, e
 			Teams TeamConnection `graphql:"teams(after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
 
+	variables = client.PopulatePaginationParams(variables)
 	if err := client.Query(&q, *variables, WithName("TeamList")); err != nil {
 		return nil, err
 	}
@@ -389,9 +385,8 @@ func (client *Client) ListTeamsWithManager(email string, variables *PayloadVaria
 			Teams TeamConnection `graphql:"teams(managerEmail: $email, after: $after, first: $first)"`
 		}
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["email"] = email
 
 	if err := client.Query(&q, *variables, WithName("TeamList")); err != nil {
diff --git a/user.go b/user.go
index f6a07a42..5b2bf018 100644
--- a/user.go
+++ b/user.go
@@ -45,9 +45,8 @@ func (userId *UserId) GetTags(client *Client, variables *PayloadVariables) (*Tag
 	if userId.Id == "" {
 		return nil, fmt.Errorf("unable to get Tags, invalid User id: '%s'", userId.Id)
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["user"] = userId.Id
 	if err := client.Query(&q, *variables, WithName("UserTagsList")); err != nil {
 		return nil, err
@@ -82,9 +81,8 @@ func (user *User) Teams(client *Client, variables *PayloadVariables) (*TeamIdCon
 	if user.Id == "" {
 		return nil, fmt.Errorf("unable to get teams, nil user id")
 	}
-	if variables == nil {
-		variables = client.InitialPageVariablesPointer()
-	}
+
+	variables = client.PopulatePaginationParams(variables)
 	(*variables)["user"] = user.Id
 	if err := client.Query(&q, *variables, WithName("UserTeamsList")); err != nil { // what goes in "" here and how is it derived?
 		return nil, err