From 2f14ac0a25feaa4c7eb2058aea48644372529181 Mon Sep 17 00:00:00 2001
From: Jose Bogarin Solano <jbogarin@altus.cr>
Date: Fri, 6 Aug 2021 17:44:34 -0600
Subject: [PATCH] Fixes issue #20. Changes to how the client is created

---
 examples/people/main.go       |  1 +
 sdk/admin_audit_events_api.go |  2 +-
 sdk/api_client.go             | 11 +++++------
 sdk/contents_api.go           |  2 +-
 sdk/devices_api.go            | 22 +++++++++++-----------
 sdk/events_api.go             |  4 ++--
 sdk/licenses_api.go           | 18 +++++++++---------
 sdk/meetings_api.go           | 22 +++++++++++-----------
 sdk/memberships_api.go        | 24 ++++++++++++------------
 sdk/messages_api.go           | 22 +++++++++++-----------
 sdk/organizations_api.go      | 18 +++++++++---------
 sdk/people_api.go             | 26 +++++++++++++-------------
 sdk/places_api.go             | 24 ++++++++++++------------
 sdk/recordings_api.go         | 20 ++++++++++----------
 sdk/roles_api.go              | 18 +++++++++---------
 sdk/rooms_api.go              | 24 ++++++++++++------------
 sdk/team_memberships_api.go   | 24 ++++++++++++------------
 sdk/teams_api.go              | 24 ++++++++++++------------
 sdk/webhooks_api.go           | 24 ++++++++++++------------
 19 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/examples/people/main.go b/examples/people/main.go
index e1e3754..8aec5ed 100644
--- a/examples/people/main.go
+++ b/examples/people/main.go
@@ -9,6 +9,7 @@ import (
 
 // Client is Webex Teams API client
 var Client *webexteams.Client
+var Client2 *webexteams.Client
 
 func main() {
 	Client = webexteams.NewClient()
diff --git a/sdk/admin_audit_events_api.go b/sdk/admin_audit_events_api.go
index ed99816..6fd63ce 100644
--- a/sdk/admin_audit_events_api.go
+++ b/sdk/admin_audit_events_api.go
@@ -61,7 +61,7 @@ func (s *AdminAuditEventsService) ListAdminAuditEvents(listAdminAuditEventsQuery
 
 	queryString, _ := query.Values(listAdminAuditEventsQueryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryString.Encode()).
 		SetResult(&AuditEvents{}).
 		SetError(&Error{}).
diff --git a/sdk/api_client.go b/sdk/api_client.go
index 0884ec6..877b914 100644
--- a/sdk/api_client.go
+++ b/sdk/api_client.go
@@ -7,7 +7,6 @@ import (
 )
 
 // RestyClient is the REST Client
-var RestyClient *resty.Client
 
 const apiURL = "https://webexapis.com/v1"
 
@@ -35,12 +34,12 @@ type Client struct {
 }
 
 type service struct {
-	client *Client
+	client *resty.Client
 }
 
 // SetAuthToken defines the Authorization token sent in the request
 func (s *Client) SetAuthToken(accessToken string) {
-	RestyClient.SetAuthToken(accessToken)
+	s.common.client.SetAuthToken(accessToken)
 }
 
 // NewClient creates a new API client. Requires a userAgent string describing your application.
@@ -48,10 +47,10 @@ func (s *Client) SetAuthToken(accessToken string) {
 func NewClient() *Client {
 	client := resty.New()
 	c := &Client{}
-	RestyClient = client
-	RestyClient.SetHostURL(apiURL)
+	c.common.client = client
+	c.common.client.SetHostURL(apiURL)
 	if os.Getenv("WEBEX_TEAMS_ACCESS_TOKEN") != "" {
-		RestyClient.SetAuthToken(os.Getenv("WEBEX_TEAMS_ACCESS_TOKEN"))
+		c.common.client.SetAuthToken(os.Getenv("WEBEX_TEAMS_ACCESS_TOKEN"))
 	}
 
 	// API Services
diff --git a/sdk/contents_api.go b/sdk/contents_api.go
index fcd2af2..0f4d58b 100644
--- a/sdk/contents_api.go
+++ b/sdk/contents_api.go
@@ -20,7 +20,7 @@ func (s *ContentsService) GetContent(contentID string) (*resty.Response, error)
 	path := "/contents/{contentId}"
 	path = strings.Replace(path, "{"+"contentId"+"}", fmt.Sprintf("%v", contentID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Get(path)
 
diff --git a/sdk/devices_api.go b/sdk/devices_api.go
index c7345a0..c39aded 100644
--- a/sdk/devices_api.go
+++ b/sdk/devices_api.go
@@ -60,12 +60,12 @@ func (devices *Devices) AddDevice(item Device) []Device {
 	return devices.Items
 }
 
-func devicesPagination(linkHeader string, size, max int) *Devices {
+func (s *DevicesService) devicesPagination(linkHeader string, size, max int) *Devices {
 	items := &Devices{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Devices{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -77,13 +77,13 @@ func devicesPagination(linkHeader string, size, max int) *Devices {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					devices := devicesPagination(response.Header().Get("Link"), size, max)
+					devices := s.devicesPagination(response.Header().Get("Link"), size, max)
 					for _, device := range devices.Items {
 						items.AddDevice(device)
 					}
 				}
 			} else {
-				devices := devicesPagination(response.Header().Get("Link"), size, max)
+				devices := s.devicesPagination(response.Header().Get("Link"), size, max)
 				for _, device := range devices.Items {
 					items.AddDevice(device)
 				}
@@ -106,7 +106,7 @@ func (s *DevicesService) CreateDeviceActivationCode(deviceCodeRequest *DeviceCod
 
 	path := "/devices/activationCode"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(deviceCodeRequest).
 		SetResult(&DeviceCode{}).
 		SetError(&Error{}).
@@ -133,7 +133,7 @@ func (s *DevicesService) DeleteDevice(deviceID string) (*resty.Response, error)
 	path := "/devices/{deviceId}"
 	path = strings.Replace(path, "{"+"deviceId"+"}", fmt.Sprintf("%v", deviceID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -155,7 +155,7 @@ func (s *DevicesService) GetDevice(deviceID string) (*Device, *resty.Response, e
 	path := "/devices/{deviceId}"
 	path = strings.Replace(path, "{"+"deviceId"+"}", fmt.Sprintf("%v", deviceID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Device{}).
 		SetError(&Error{}).
 		Get(path)
@@ -216,7 +216,7 @@ func (s *DevicesService) ListDevices(queryParams *ListDevicesQueryParams) (*Devi
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Devices{}).
 		SetError(&Error{}).
@@ -227,14 +227,14 @@ func (s *DevicesService) ListDevices(queryParams *ListDevicesQueryParams) (*Devi
 	}
 
 	result := response.Result().(*Devices)
-	if queryParams.Paginate == true {
-		items := devicesPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.devicesPagination(response.Header().Get("Link"), 0, 0)
 		for _, device := range items.Items {
 			result.AddDevice(device)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := devicesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.devicesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, device := range items.Items {
 				result.AddDevice(device)
 			}
diff --git a/sdk/events_api.go b/sdk/events_api.go
index 4028208..d697bb6 100644
--- a/sdk/events_api.go
+++ b/sdk/events_api.go
@@ -65,7 +65,7 @@ func (s *EventsService) ListEvents(listEventsQueryParams *ListEventsQueryParams)
 
 	queryString, _ := query.Values(listEventsQueryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryString.Encode()).
 		SetResult(&Events{}).
 		SetError(&Error{}).
@@ -91,7 +91,7 @@ func (s *EventsService) GetEvent(eventID string) (*Event, *resty.Response, error
 	path := "/events/{eventId}"
 	path = strings.Replace(path, "{"+"eventId"+"}", fmt.Sprintf("%v", eventID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Event{}).
 		SetError(&Error{}).
 		Get(path)
diff --git a/sdk/licenses_api.go b/sdk/licenses_api.go
index 688e5de..521825d 100644
--- a/sdk/licenses_api.go
+++ b/sdk/licenses_api.go
@@ -31,13 +31,13 @@ func (licenses *Licenses) AddLicense(item License) []License {
 	return licenses.Items
 }
 
-func licensesPagination(linkHeader string, size, max int) *Licenses {
+func (s *LicensesService) licensesPagination(linkHeader string, size, max int) *Licenses {
 	items := &Licenses{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Licenses{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -49,13 +49,13 @@ func licensesPagination(linkHeader string, size, max int) *Licenses {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					licenses := licensesPagination(response.Header().Get("Link"), size, max)
+					licenses := s.licensesPagination(response.Header().Get("Link"), size, max)
 					for _, license := range licenses.Items {
 						items.AddLicense(license)
 					}
 				}
 			} else {
-				licenses := licensesPagination(response.Header().Get("Link"), size, max)
+				licenses := s.licensesPagination(response.Header().Get("Link"), size, max)
 				for _, license := range licenses.Items {
 					items.AddLicense(license)
 				}
@@ -79,7 +79,7 @@ func (s *LicensesService) GetLicense(licenseID string) (*License, *resty.Respons
 	path := "/licenses/{licenseId}"
 	path = strings.Replace(path, "{"+"licenseId"+"}", fmt.Sprintf("%v", licenseID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&License{}).
 		SetError(&Error{}).
 		Get(path)
@@ -113,7 +113,7 @@ func (s *LicensesService) ListLicenses(queryParams *ListLicensesQueryParams) (*L
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Licenses{}).
 		SetError(&Error{}).
@@ -124,14 +124,14 @@ func (s *LicensesService) ListLicenses(queryParams *ListLicensesQueryParams) (*L
 	}
 
 	result := response.Result().(*Licenses)
-	if queryParams.Paginate == true {
-		items := licensesPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.licensesPagination(response.Header().Get("Link"), 0, 0)
 		for _, license := range items.Items {
 			result.AddLicense(license)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := licensesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.licensesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, license := range items.Items {
 				result.AddLicense(license)
 			}
diff --git a/sdk/meetings_api.go b/sdk/meetings_api.go
index 851ac59..8e8a199 100644
--- a/sdk/meetings_api.go
+++ b/sdk/meetings_api.go
@@ -86,13 +86,13 @@ func (meetings *Meetings) AddMeeting(item Meeting) []Meeting {
 	return meetings.Items
 }
 
-func meetingsPagination(linkHeader string, size, max int) *Meetings {
+func (s *MeetingsService) meetingsPagination(linkHeader string, size, max int) *Meetings {
 	items := &Meetings{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Meetings{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -104,13 +104,13 @@ func meetingsPagination(linkHeader string, size, max int) *Meetings {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					meetings := meetingsPagination(response.Header().Get("Link"), size, max)
+					meetings := s.meetingsPagination(response.Header().Get("Link"), size, max)
 					for _, meeting := range meetings.Items {
 						items.AddMeeting(meeting)
 					}
 				}
 			} else {
-				meetings := meetingsPagination(response.Header().Get("Link"), size, max)
+				meetings := s.meetingsPagination(response.Header().Get("Link"), size, max)
 				for _, meeting := range meetings.Items {
 					items.AddMeeting(meeting)
 				}
@@ -133,7 +133,7 @@ func (s *MeetingsService) CreateMeeting(meetingCreateRequest *MeetingCreateReque
 
 	path := "/meetings/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(meetingCreateRequest).
 		SetResult(&Meeting{}).
 		SetError(&Error{}).
@@ -158,7 +158,7 @@ func (s *MeetingsService) DeleteMeeting(meetingID string) (*resty.Response, erro
 	path := "/meetings/{meetingId}"
 	path = strings.Replace(path, "{"+"meetingId"+"}", fmt.Sprintf("%v", meetingID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -182,7 +182,7 @@ func (s *MeetingsService) GetMeeting(meetingID string) (*Meeting, *resty.Respons
 	path := "/meetings/{meetingId}"
 	path = strings.Replace(path, "{"+"meetingId"+"}", fmt.Sprintf("%v", meetingID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Meeting{}).
 		SetError(&Error{}).
 		Get(path)
@@ -225,7 +225,7 @@ func (s *MeetingsService) ListMeetings(queryParams *ListMeetingsQueryParams) (*M
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Meetings{}).
 		SetError(&Error{}).
@@ -236,14 +236,14 @@ func (s *MeetingsService) ListMeetings(queryParams *ListMeetingsQueryParams) (*M
 	}
 
 	result := response.Result().(*Meetings)
-	if queryParams.Paginate == true {
-		items := meetingsPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.meetingsPagination(response.Header().Get("Link"), 0, 0)
 		for _, meeting := range items.Items {
 			result.AddMeeting(meeting)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := meetingsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.meetingsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, meeting := range items.Items {
 				result.AddMeeting(meeting)
 			}
diff --git a/sdk/memberships_api.go b/sdk/memberships_api.go
index 75e04f6..ca35743 100644
--- a/sdk/memberships_api.go
+++ b/sdk/memberships_api.go
@@ -50,13 +50,13 @@ func (memberships *Memberships) AddMembership(item Membership) []Membership {
 	return memberships.Items
 }
 
-func membershipsPagination(linkHeader string, size, max int) *Memberships {
+func (s *MembershipsService) membershipsPagination(linkHeader string, size, max int) *Memberships {
 	items := &Memberships{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Memberships{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -68,13 +68,13 @@ func membershipsPagination(linkHeader string, size, max int) *Memberships {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					memberships := membershipsPagination(response.Header().Get("Link"), size, max)
+					memberships := s.membershipsPagination(response.Header().Get("Link"), size, max)
 					for _, membership := range memberships.Items {
 						items.AddMembership(membership)
 					}
 				}
 			} else {
-				memberships := membershipsPagination(response.Header().Get("Link"), size, max)
+				memberships := s.membershipsPagination(response.Header().Get("Link"), size, max)
 				for _, membership := range memberships.Items {
 					items.AddMembership(membership)
 				}
@@ -95,7 +95,7 @@ func (s *MembershipsService) CreateMembership(membershipCreateRequest *Membershi
 
 	path := "/memberships/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(membershipCreateRequest).
 		SetResult(&Membership{}).
 		SetError(&Error{}).
@@ -122,7 +122,7 @@ func (s *MembershipsService) DeleteMembership(membershipID string) (*resty.Respo
 	path := "/memberships/{membershipId}"
 	path = strings.Replace(path, "{"+"membershipId"+"}", fmt.Sprintf("%v", membershipID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -146,7 +146,7 @@ func (s *MembershipsService) GetMembership(membershipID string) (*Membership, *r
 	path := "/memberships/{membershipId}"
 	path = strings.Replace(path, "{"+"membershipId"+"}", fmt.Sprintf("%v", membershipID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Membership{}).
 		SetError(&Error{}).
 		Get(path)
@@ -189,7 +189,7 @@ func (s *MembershipsService) ListMemberships(queryParams *ListMembershipsQueryPa
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Memberships{}).
 		SetError(&Error{}).
@@ -200,14 +200,14 @@ func (s *MembershipsService) ListMemberships(queryParams *ListMembershipsQueryPa
 	}
 
 	result := response.Result().(*Memberships)
-	if queryParams.Paginate == true {
-		items := membershipsPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.membershipsPagination(response.Header().Get("Link"), 0, 0)
 		for _, membership := range items.Items {
 			result.AddMembership(membership)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := membershipsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.membershipsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, membership := range items.Items {
 				result.AddMembership(membership)
 			}
@@ -231,7 +231,7 @@ func (s *MembershipsService) UpdateMembership(membershipID string, membershipUpd
 	path := "/memberships/{membershipId}"
 	path = strings.Replace(path, "{"+"membershipId"+"}", fmt.Sprintf("%v", membershipID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(membershipUpdateRequest).
 		SetResult(&Membership{}).
 		SetError(&Error{}).
diff --git a/sdk/messages_api.go b/sdk/messages_api.go
index bc1507f..35108a9 100644
--- a/sdk/messages_api.go
+++ b/sdk/messages_api.go
@@ -60,13 +60,13 @@ func (messages *Messages) AddMessage(item Message) []Message {
 	return messages.Items
 }
 
-func messagesPagination(linkHeader string, size, max int) *Messages {
+func (s *MessagesService) messagesPagination(linkHeader string, size, max int) *Messages {
 	items := &Messages{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Messages{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -78,13 +78,13 @@ func messagesPagination(linkHeader string, size, max int) *Messages {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					messages := messagesPagination(response.Header().Get("Link"), size, max)
+					messages := s.messagesPagination(response.Header().Get("Link"), size, max)
 					for _, message := range messages.Items {
 						items.AddMessage(message)
 					}
 				}
 			} else {
-				messages := messagesPagination(response.Header().Get("Link"), size, max)
+				messages := s.messagesPagination(response.Header().Get("Link"), size, max)
 				for _, message := range messages.Items {
 					items.AddMessage(message)
 				}
@@ -107,7 +107,7 @@ func (s *MessagesService) CreateMessage(messageCreateRequest *MessageCreateReque
 
 	path := "/messages/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(messageCreateRequest).
 		SetResult(&Message{}).
 		SetError(&Error{}).
@@ -132,7 +132,7 @@ func (s *MessagesService) DeleteMessage(messageID string) (*resty.Response, erro
 	path := "/messages/{messageId}"
 	path = strings.Replace(path, "{"+"messageId"+"}", fmt.Sprintf("%v", messageID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -156,7 +156,7 @@ func (s *MessagesService) GetMessage(messageID string) (*Message, *resty.Respons
 	path := "/messages/{messageId}"
 	path = strings.Replace(path, "{"+"messageId"+"}", fmt.Sprintf("%v", messageID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Message{}).
 		SetError(&Error{}).
 		Get(path)
@@ -199,7 +199,7 @@ func (s *MessagesService) ListMessages(queryParams *ListMessagesQueryParams) (*M
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Messages{}).
 		SetError(&Error{}).
@@ -210,14 +210,14 @@ func (s *MessagesService) ListMessages(queryParams *ListMessagesQueryParams) (*M
 	}
 
 	result := response.Result().(*Messages)
-	if queryParams.Paginate == true {
-		items := messagesPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.messagesPagination(response.Header().Get("Link"), 0, 0)
 		for _, message := range items.Items {
 			result.AddMessage(message)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := messagesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.messagesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, message := range items.Items {
 				result.AddMessage(message)
 			}
diff --git a/sdk/organizations_api.go b/sdk/organizations_api.go
index 55b62d9..179b295 100644
--- a/sdk/organizations_api.go
+++ b/sdk/organizations_api.go
@@ -31,13 +31,13 @@ func (organizations *Organizations) AddOrganization(item Organization) []Organiz
 	return organizations.Items
 }
 
-func organizationsPagination(linkHeader string, size, max int) *Organizations {
+func (s *OrganizationsService) organizationsPagination(linkHeader string, size, max int) *Organizations {
 	items := &Organizations{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Organizations{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -49,13 +49,13 @@ func organizationsPagination(linkHeader string, size, max int) *Organizations {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					organizations := organizationsPagination(response.Header().Get("Link"), size, max)
+					organizations := s.organizationsPagination(response.Header().Get("Link"), size, max)
 					for _, organization := range organizations.Items {
 						items.AddOrganization(organization)
 					}
 				}
 			} else {
-				organizations := organizationsPagination(response.Header().Get("Link"), size, max)
+				organizations := s.organizationsPagination(response.Header().Get("Link"), size, max)
 				for _, organization := range organizations.Items {
 					items.AddOrganization(organization)
 				}
@@ -79,7 +79,7 @@ func (s *OrganizationsService) GetOrganization(orgID string) (*Organization, *re
 	path := "/organizations/{orgId}"
 	path = strings.Replace(path, "{"+"orgId"+"}", fmt.Sprintf("%v", orgID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Organization{}).
 		SetError(&Error{}).
 		Get(path)
@@ -111,7 +111,7 @@ func (s *OrganizationsService) ListOrganizations(queryParams *ListOrganizationsQ
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Organizations{}).
 		SetError(&Error{}).
@@ -122,14 +122,14 @@ func (s *OrganizationsService) ListOrganizations(queryParams *ListOrganizationsQ
 	}
 
 	result := response.Result().(*Organizations)
-	if queryParams.Paginate == true {
-		items := organizationsPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.organizationsPagination(response.Header().Get("Link"), 0, 0)
 		for _, organization := range items.Items {
 			result.AddOrganization(organization)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := organizationsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.organizationsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, organization := range items.Items {
 				result.AddOrganization(organization)
 			}
diff --git a/sdk/people_api.go b/sdk/people_api.go
index 2224bfb..d9d0695 100644
--- a/sdk/people_api.go
+++ b/sdk/people_api.go
@@ -73,12 +73,12 @@ func (people *People) AddPerson(item Person) []Person {
 	return people.Items
 }
 
-func peoplePagination(linkHeader string, size, max int) *People {
+func (s *PeopleService) peoplePagination(linkHeader string, size, max int) *People {
 	items := &People{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&People{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -90,13 +90,13 @@ func peoplePagination(linkHeader string, size, max int) *People {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					people := peoplePagination(response.Header().Get("Link"), size, max)
+					people := s.peoplePagination(response.Header().Get("Link"), size, max)
 					for _, person := range people.Items {
 						items.AddPerson(person)
 					}
 				}
 			} else {
-				people := peoplePagination(response.Header().Get("Link"), size, max)
+				people := s.peoplePagination(response.Header().Get("Link"), size, max)
 				for _, person := range people.Items {
 					items.AddPerson(person)
 				}
@@ -119,7 +119,7 @@ func (s *PeopleService) CreatePerson(personRequest *PersonRequest) (*Person, *re
 
 	path := "/people/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(personRequest).
 		SetResult(&Person{}).
 		SetError(&Error{}).
@@ -146,7 +146,7 @@ func (s *PeopleService) DeletePerson(personID string) (*resty.Response, error) {
 	path := "/people/{personId}"
 	path = strings.Replace(path, "{"+"personId"+"}", fmt.Sprintf("%v", personID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -166,7 +166,7 @@ func (s *PeopleService) GetMe() (*Person, *resty.Response, error) {
 
 	path := "/people/me"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Person{}).
 		SetError(&Error{}).
 		Get(path)
@@ -192,7 +192,7 @@ func (s *PeopleService) GetPerson(personID string) (*Person, *resty.Response, er
 	path := "/people/{personId}"
 	path = strings.Replace(path, "{"+"personId"+"}", fmt.Sprintf("%v", personID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Person{}).
 		SetError(&Error{}).
 		Get(path)
@@ -234,7 +234,7 @@ func (s *PeopleService) ListPeople(queryParams *ListPeopleQueryParams) (*People,
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&People{}).
 		SetError(&Error{}).
@@ -245,14 +245,14 @@ func (s *PeopleService) ListPeople(queryParams *ListPeopleQueryParams) (*People,
 	}
 
 	result := response.Result().(*People)
-	if queryParams.Paginate == true {
-		items := peoplePagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.peoplePagination(response.Header().Get("Link"), 0, 0)
 		for _, person := range items.Items {
 			result.AddPerson(person)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := peoplePagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.peoplePagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, person := range items.Items {
 				result.AddPerson(person)
 			}
@@ -276,7 +276,7 @@ func (s *PeopleService) Update(personID string, personRequest *PersonRequest) (*
 	path := "/people/{personId}"
 	path = strings.Replace(path, "{"+"personId"+"}", fmt.Sprintf("%v", personID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(personRequest).
 		SetResult(&Person{}).
 		SetError(&Error{}).
diff --git a/sdk/places_api.go b/sdk/places_api.go
index 5783755..6c168d6 100644
--- a/sdk/places_api.go
+++ b/sdk/places_api.go
@@ -47,13 +47,13 @@ func (places *Places) AddPlace(item Place) []Place {
 	return places.Items
 }
 
-func placesPagination(linkHeader string, size, max int) *Places {
+func (s *PlacesService) placesPagination(linkHeader string, size, max int) *Places {
 	items := &Places{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Places{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -65,13 +65,13 @@ func placesPagination(linkHeader string, size, max int) *Places {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					places := placesPagination(response.Header().Get("Link"), size, max)
+					places := s.placesPagination(response.Header().Get("Link"), size, max)
 					for _, place := range places.Items {
 						items.AddPlace(place)
 					}
 				}
 			} else {
-				places := placesPagination(response.Header().Get("Link"), size, max)
+				places := s.placesPagination(response.Header().Get("Link"), size, max)
 				for _, place := range places.Items {
 					items.AddPlace(place)
 				}
@@ -94,7 +94,7 @@ func (s *PlacesService) CreatePlace(placeCreateRequest *PlaceCreateRequest) (*Pl
 
 	path := "/places/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(placeCreateRequest).
 		SetResult(&Place{}).
 		SetError(&Error{}).
@@ -122,7 +122,7 @@ func (s *PlacesService) DeletePlace(placeID string) (*resty.Response, error) {
 	path := "/places/{placeId}"
 	path = strings.Replace(path, "{"+"placeId"+"}", fmt.Sprintf("%v", placeID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		Delete(path)
 
 	if err != nil {
@@ -146,7 +146,7 @@ func (s *PlacesService) GetPlace(placeID string) (*Place, *resty.Response, error
 	path := "/places/{placeId}"
 	path = strings.Replace(path, "{"+"placeId"+"}", fmt.Sprintf("%v", placeID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Place{}).
 		SetError(&Error{}).
 		Get(path)
@@ -188,7 +188,7 @@ func (s *PlacesService) ListPlaces(queryParams *ListPlacesQueryParams) (*Places,
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Places{}).
 		Get(path)
@@ -198,14 +198,14 @@ func (s *PlacesService) ListPlaces(queryParams *ListPlacesQueryParams) (*Places,
 	}
 
 	result := response.Result().(*Places)
-	if queryParams.Paginate == true {
-		items := placesPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.placesPagination(response.Header().Get("Link"), 0, 0)
 		for _, place := range items.Items {
 			result.AddPlace(place)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := placesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.placesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, place := range items.Items {
 				result.AddPlace(place)
 			}
@@ -229,7 +229,7 @@ func (s *PlacesService) UpdatePlace(placeID string, placeUpdateRequest *PlaceUpd
 	path := "/places/{placeId}"
 	path = strings.Replace(path, "{"+"placeId"+"}", fmt.Sprintf("%v", placeID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(placeUpdateRequest).
 		SetResult(&Place{}).
 		SetError(&Error{}).
diff --git a/sdk/recordings_api.go b/sdk/recordings_api.go
index cde885b..4fec52c 100644
--- a/sdk/recordings_api.go
+++ b/sdk/recordings_api.go
@@ -61,12 +61,12 @@ func (recordings *Recordings) AddRecording(item Recording) []Recording {
 	return recordings.Items
 }
 
-func recordingsPagination(linkHeader string, size, max int) *Recordings {
+func (s *RecordingsService) recordingsPagination(linkHeader string, size, max int) *Recordings {
 	items := &Recordings{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Recordings{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -78,13 +78,13 @@ func recordingsPagination(linkHeader string, size, max int) *Recordings {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					recordings := recordingsPagination(response.Header().Get("Link"), size, max)
+					recordings := s.recordingsPagination(response.Header().Get("Link"), size, max)
 					for _, recording := range recordings.Items {
 						items.AddRecording(recording)
 					}
 				}
 			} else {
-				recordings := recordingsPagination(response.Header().Get("Link"), size, max)
+				recordings := s.recordingsPagination(response.Header().Get("Link"), size, max)
 				for _, recording := range recordings.Items {
 					items.AddRecording(recording)
 				}
@@ -121,7 +121,7 @@ func (s *RecordingsService) ListRecordings(queryParams *ListRecordingsQueryParam
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Recordings{}).
 		SetError(&Error{}).
@@ -132,14 +132,14 @@ func (s *RecordingsService) ListRecordings(queryParams *ListRecordingsQueryParam
 	}
 
 	result := response.Result().(*Recordings)
-	if queryParams.Paginate == true {
-		items := recordingsPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.recordingsPagination(response.Header().Get("Link"), 0, 0)
 		for _, recording := range items.Items {
 			result.AddRecording(recording)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := recordingsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.recordingsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, recording := range items.Items {
 				result.AddRecording(recording)
 			}
@@ -159,7 +159,7 @@ func (s *RecordingsService) GetRecording(recordingID string) (*RecordingDetails,
 	path := "/recordings/{recordingId}"
 	path = strings.Replace(path, "{"+"recordingId"+"}", fmt.Sprintf("%v", recordingID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&RecordingDetails{}).
 		SetError(&Error{}).
 		Get(path)
@@ -186,7 +186,7 @@ func (s *RecordingsService) DeleteRecording(recordingID string) (*resty.Response
 	path := "/recordings/{recordingId}"
 	path = strings.Replace(path, "{"+"recordingId"+"}", fmt.Sprintf("%v", recordingID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
diff --git a/sdk/roles_api.go b/sdk/roles_api.go
index a3ba7c4..398f68c 100644
--- a/sdk/roles_api.go
+++ b/sdk/roles_api.go
@@ -29,13 +29,13 @@ func (roles *Roles) AddRole(item Role) []Role {
 	return roles.Items
 }
 
-func rolesPagination(linkHeader string, size, max int) *Roles {
+func (s *RolesService) rolesPagination(linkHeader string, size, max int) *Roles {
 	items := &Roles{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Roles{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -47,13 +47,13 @@ func rolesPagination(linkHeader string, size, max int) *Roles {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					roles := rolesPagination(response.Header().Get("Link"), size, max)
+					roles := s.rolesPagination(response.Header().Get("Link"), size, max)
 					for _, role := range roles.Items {
 						items.AddRole(role)
 					}
 				}
 			} else {
-				roles := rolesPagination(response.Header().Get("Link"), size, max)
+				roles := s.rolesPagination(response.Header().Get("Link"), size, max)
 				for _, role := range roles.Items {
 					items.AddRole(role)
 				}
@@ -77,7 +77,7 @@ func (s *RolesService) GetRole(roleID string) (*Role, *resty.Response, error) {
 	path := "/roles/{roleId}"
 	path = strings.Replace(path, "{"+"roleId"+"}", fmt.Sprintf("%v", roleID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Role{}).
 		SetError(&Error{}).
 		Get(path)
@@ -109,7 +109,7 @@ func (s *RolesService) ListRoles(queryParams *RolesListQueryParams) (*Roles, *re
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Roles{}).
 		SetError(&Error{}).
@@ -120,14 +120,14 @@ func (s *RolesService) ListRoles(queryParams *RolesListQueryParams) (*Roles, *re
 	}
 
 	result := response.Result().(*Roles)
-	if queryParams.Paginate == true {
-		items := rolesPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.rolesPagination(response.Header().Get("Link"), 0, 0)
 		for _, role := range items.Items {
 			result.AddRole(role)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := rolesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.rolesPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, role := range items.Items {
 				result.AddRole(role)
 			}
diff --git a/sdk/rooms_api.go b/sdk/rooms_api.go
index 57bb6fc..312bbca 100644
--- a/sdk/rooms_api.go
+++ b/sdk/rooms_api.go
@@ -47,13 +47,13 @@ func (rooms *Rooms) AddRoom(item Room) []Room {
 	return rooms.Items
 }
 
-func roomsPagination(linkHeader string, size, max int) *Rooms {
+func (s *RoomsService) roomsPagination(linkHeader string, size, max int) *Rooms {
 	items := &Rooms{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Rooms{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -65,13 +65,13 @@ func roomsPagination(linkHeader string, size, max int) *Rooms {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					rooms := roomsPagination(response.Header().Get("Link"), size, max)
+					rooms := s.roomsPagination(response.Header().Get("Link"), size, max)
 					for _, room := range rooms.Items {
 						items.AddRoom(room)
 					}
 				}
 			} else {
-				rooms := roomsPagination(response.Header().Get("Link"), size, max)
+				rooms := s.roomsPagination(response.Header().Get("Link"), size, max)
 				for _, room := range rooms.Items {
 					items.AddRoom(room)
 				}
@@ -94,7 +94,7 @@ func (s *RoomsService) CreateRoom(roomCreateRequest *RoomCreateRequest) (*Room,
 
 	path := "/rooms/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(roomCreateRequest).
 		SetResult(&Room{}).
 		SetError(&Error{}).
@@ -122,7 +122,7 @@ func (s *RoomsService) DeleteRoom(roomID string) (*resty.Response, error) {
 	path := "/rooms/{roomId}"
 	path = strings.Replace(path, "{"+"roomId"+"}", fmt.Sprintf("%v", roomID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -147,7 +147,7 @@ func (s *RoomsService) GetRoom(roomID string) (*Room, *resty.Response, error) {
 	path := "/rooms/{roomId}"
 	path = strings.Replace(path, "{"+"roomId"+"}", fmt.Sprintf("%v", roomID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Room{}).
 		SetError(&Error{}).
 		Get(path)
@@ -189,7 +189,7 @@ func (s *RoomsService) ListRooms(queryParams *ListRoomsQueryParams) (*Rooms, *re
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Rooms{}).
 		SetError(&Error{}).
@@ -200,14 +200,14 @@ func (s *RoomsService) ListRooms(queryParams *ListRoomsQueryParams) (*Rooms, *re
 	}
 
 	result := response.Result().(*Rooms)
-	if queryParams.Paginate == true {
-		items := roomsPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.roomsPagination(response.Header().Get("Link"), 0, 0)
 		for _, room := range items.Items {
 			result.AddRoom(room)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := roomsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.roomsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, room := range items.Items {
 				result.AddRoom(room)
 			}
@@ -231,7 +231,7 @@ func (s *RoomsService) UpdateRoom(roomID string, roomUpdateRequest *RoomUpdateRe
 	path := "/rooms/{roomId}"
 	path = strings.Replace(path, "{"+"roomId"+"}", fmt.Sprintf("%v", roomID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(roomUpdateRequest).
 		SetResult(&Room{}).
 		SetError(&Error{}).
diff --git a/sdk/team_memberships_api.go b/sdk/team_memberships_api.go
index 4bc1302..748c200 100644
--- a/sdk/team_memberships_api.go
+++ b/sdk/team_memberships_api.go
@@ -48,13 +48,13 @@ func (teamMembership *TeamMemberships) AddTeamMembership(item TeamMembership) []
 	return teamMembership.Items
 }
 
-func teamMembershipsPagination(linkHeader string, size, max int) *TeamMemberships {
+func (s *TeamMembershipsService) teamMembershipsPagination(linkHeader string, size, max int) *TeamMemberships {
 	items := &TeamMemberships{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&TeamMemberships{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -66,13 +66,13 @@ func teamMembershipsPagination(linkHeader string, size, max int) *TeamMembership
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					teamMemberships := teamMembershipsPagination(response.Header().Get("Link"), size, max)
+					teamMemberships := s.teamMembershipsPagination(response.Header().Get("Link"), size, max)
 					for _, teamMembership := range teamMemberships.Items {
 						items.AddTeamMembership(teamMembership)
 					}
 				}
 			} else {
-				teamMemberships := teamMembershipsPagination(response.Header().Get("Link"), size, max)
+				teamMemberships := s.teamMembershipsPagination(response.Header().Get("Link"), size, max)
 				for _, teamMembership := range teamMemberships.Items {
 					items.AddTeamMembership(teamMembership)
 				}
@@ -93,7 +93,7 @@ func (s *TeamMembershipsService) CreateTeamMembership(teamMemberhipCreateRequest
 
 	path := "/team/memberships/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(teamMemberhipCreateRequest).
 		SetResult(&TeamMembership{}).
 		SetError(&Error{}).
@@ -120,7 +120,7 @@ func (s *TeamMembershipsService) DeleteTeamMembership(membershipID string) (*res
 	path := "/team/memberships/{membershipId}"
 	path = strings.Replace(path, "{"+"membershipId"+"}", fmt.Sprintf("%v", membershipID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -144,7 +144,7 @@ func (s *TeamMembershipsService) GetTeamMembership(membershipID string) (*TeamMe
 	path := "/team/memberships/{membershipId}"
 	path = strings.Replace(path, "{"+"membershipId"+"}", fmt.Sprintf("%v", membershipID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&TeamMembership{}).
 		SetError(&Error{}).
 		Get(path)
@@ -180,7 +180,7 @@ func (s *TeamMembershipsService) ListTeamMemberhips(queryParams *ListTeamMemberh
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&TeamMemberships{}).
 		SetError(&Error{}).
@@ -191,14 +191,14 @@ func (s *TeamMembershipsService) ListTeamMemberhips(queryParams *ListTeamMemberh
 	}
 
 	result := response.Result().(*TeamMemberships)
-	if queryParams.Paginate == true {
-		items := teamMembershipsPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.teamMembershipsPagination(response.Header().Get("Link"), 0, 0)
 		for _, teamMembership := range items.Items {
 			result.AddTeamMembership(teamMembership)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := teamMembershipsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.teamMembershipsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, teamMembership := range items.Items {
 				result.AddTeamMembership(teamMembership)
 			}
@@ -221,7 +221,7 @@ func (s *TeamMembershipsService) UpdateTeamMembership(membershipID string, teamM
 	path := "/team/memberships/{membershipId}"
 	path = strings.Replace(path, "{"+"membershipId"+"}", fmt.Sprintf("%v", membershipID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(teamMembershipUpdateRequest).
 		SetResult(&TeamMembership{}).
 		SetError(&Error{}).
diff --git a/sdk/teams_api.go b/sdk/teams_api.go
index baac77f..15fdd14 100644
--- a/sdk/teams_api.go
+++ b/sdk/teams_api.go
@@ -42,13 +42,13 @@ func (teams *Teams) AddTeam(item Team) []Team {
 	return teams.Items
 }
 
-func teamsPagination(linkHeader string, size, max int) *Teams {
+func (s *TeamsService) teamsPagination(linkHeader string, size, max int) *Teams {
 	items := &Teams{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Teams{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -60,13 +60,13 @@ func teamsPagination(linkHeader string, size, max int) *Teams {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					teams := teamsPagination(response.Header().Get("Link"), size, max)
+					teams := s.teamsPagination(response.Header().Get("Link"), size, max)
 					for _, team := range teams.Items {
 						items.AddTeam(team)
 					}
 				}
 			} else {
-				teams := teamsPagination(response.Header().Get("Link"), size, max)
+				teams := s.teamsPagination(response.Header().Get("Link"), size, max)
 				for _, team := range teams.Items {
 					items.AddTeam(team)
 				}
@@ -89,7 +89,7 @@ func (s *TeamsService) CreateTeam(teamCreateRequest *TeamCreateRequest) (*Team,
 
 	path := "/teams/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(teamCreateRequest).
 		SetResult(&Team{}).
 		SetError(&Error{}).
@@ -116,7 +116,7 @@ func (s *TeamsService) DeleteTeam(teamID string) (*resty.Response, error) {
 	path := "/teams/{teamId}"
 	path = strings.Replace(path, "{"+"teamId"+"}", fmt.Sprintf("%v", teamID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -140,7 +140,7 @@ func (s *TeamsService) GetTeam(teamID string) (*Team, *resty.Response, error) {
 	path := "/teams/{teamId}"
 	path = strings.Replace(path, "{"+"teamId"+"}", fmt.Sprintf("%v", teamID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Team{}).
 		SetError(&Error{}).
 		Get(path)
@@ -172,7 +172,7 @@ func (s *TeamsService) ListTeams(queryParams *ListTeamsQueryParams) (*Teams, *re
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Teams{}).
 		SetError(&Error{}).
@@ -183,14 +183,14 @@ func (s *TeamsService) ListTeams(queryParams *ListTeamsQueryParams) (*Teams, *re
 	}
 
 	result := response.Result().(*Teams)
-	if queryParams.Paginate == true {
-		items := teamsPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.teamsPagination(response.Header().Get("Link"), 0, 0)
 		for _, team := range items.Items {
 			result.AddTeam(team)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := teamsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.teamsPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, team := range items.Items {
 				result.AddTeam(team)
 			}
@@ -213,7 +213,7 @@ func (s *TeamsService) UpdateTeam(teamID string, teamUpdateRequest *TeamUpdateRe
 	path := "/teams/{teamId}"
 	path = strings.Replace(path, "{"+"teamId"+"}", fmt.Sprintf("%v", teamID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(teamUpdateRequest).
 		SetResult(&Team{}).
 		SetError(&Error{}).
diff --git a/sdk/webhooks_api.go b/sdk/webhooks_api.go
index ac2ec8d..aa05fef 100644
--- a/sdk/webhooks_api.go
+++ b/sdk/webhooks_api.go
@@ -84,13 +84,13 @@ func (webhooks *Webhooks) AddWebhook(item Webhook) []Webhook {
 	return webhooks.Items
 }
 
-func webhooksPagination(linkHeader string, size, max int) *Webhooks {
+func (s *WebhooksService) webhooksPagination(linkHeader string, size, max int) *Webhooks {
 	items := &Webhooks{}
 
 	for _, l := range link.Parse(linkHeader) {
 		if l.Rel == "next" {
 
-			response, err := RestyClient.R().
+			response, err := s.client.R().
 				SetResult(&Webhooks{}).
 				SetError(&Error{}).
 				Get(l.URI)
@@ -102,13 +102,13 @@ func webhooksPagination(linkHeader string, size, max int) *Webhooks {
 			if size != 0 {
 				size = size + len(items.Items)
 				if size < max {
-					webhooks := webhooksPagination(response.Header().Get("Link"), size, max)
+					webhooks := s.webhooksPagination(response.Header().Get("Link"), size, max)
 					for _, webhook := range webhooks.Items {
 						items.AddWebhook(webhook)
 					}
 				}
 			} else {
-				webhooks := webhooksPagination(response.Header().Get("Link"), size, max)
+				webhooks := s.webhooksPagination(response.Header().Get("Link"), size, max)
 				for _, webhook := range webhooks.Items {
 					items.AddWebhook(webhook)
 				}
@@ -129,7 +129,7 @@ func (s *WebhooksService) CreateWebhook(webhookCreateRequest *WebhookCreateReque
 
 	path := "/webhooks/"
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(webhookCreateRequest).
 		SetResult(&Webhook{}).
 		SetError(&Error{}).
@@ -156,7 +156,7 @@ func (s *WebhooksService) DeleteWebhook(webhookID string) (*resty.Response, erro
 	path := "/webhooks/{webhookId}"
 	path = strings.Replace(path, "{"+"webhookId"+"}", fmt.Sprintf("%v", webhookID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetError(&Error{}).
 		Delete(path)
 
@@ -180,7 +180,7 @@ func (s *WebhooksService) GetWebhook(webhookID string) (*Webhook, *resty.Respons
 	path := "/webhooks/{webhookId}"
 	path = strings.Replace(path, "{"+"webhookId"+"}", fmt.Sprintf("%v", webhookID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetResult(&Webhook{}).
 		SetError(&Error{}).
 		Get(path)
@@ -212,7 +212,7 @@ func (s *WebhooksService) ListWebhooks(queryParams *ListWebhooksQueryParams) (*W
 
 	queryParamsString, _ := query.Values(queryParams)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetQueryString(queryParamsString.Encode()).
 		SetResult(&Webhooks{}).
 		SetError(&Error{}).
@@ -223,14 +223,14 @@ func (s *WebhooksService) ListWebhooks(queryParams *ListWebhooksQueryParams) (*W
 	}
 
 	result := response.Result().(*Webhooks)
-	if queryParams.Paginate == true {
-		items := webhooksPagination(response.Header().Get("Link"), 0, 0)
+	if queryParams.Paginate {
+		items := s.webhooksPagination(response.Header().Get("Link"), 0, 0)
 		for _, webhook := range items.Items {
 			result.AddWebhook(webhook)
 		}
 	} else {
 		if len(result.Items) < queryParams.Max {
-			items := webhooksPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
+			items := s.webhooksPagination(response.Header().Get("Link"), len(result.Items), queryParams.Max)
 			for _, webhook := range items.Items {
 				result.AddWebhook(webhook)
 			}
@@ -254,7 +254,7 @@ func (s *WebhooksService) UpdateWebhook(webhookID string, webhookUpdateRequest *
 	path := "/webhooks/{webhookId}"
 	path = strings.Replace(path, "{"+"webhookId"+"}", fmt.Sprintf("%v", webhookID), -1)
 
-	response, err := RestyClient.R().
+	response, err := s.client.R().
 		SetBody(webhookUpdateRequest).
 		SetResult(&Webhook{}).
 		SetError(&Error{}).