diff --git a/docs/jupiterone.md b/docs/jupiterone.md
index f7691ef..a833c6a 100644
--- a/docs/jupiterone.md
+++ b/docs/jupiterone.md
@@ -18,7 +18,11 @@
 ## Requirements
 
 - JupiterOne requires an API token. You need permission to create a user in
-  Sonarqube that will be used to obtain the API token.
+  Sonarqube that will be used to obtain the API token. The token should have the
+  `Administer System` permission to allow the ability to pull extra user
+  metadata. More information on this can be found in the sonarqube api
+  documentation of your instance
+  (`<your-instance-url>/web_api/api/users/search`).
 - You must have permission in JupiterOne to install new integrations.
 
 ## Support
@@ -82,8 +86,17 @@ The following entities are created:
 | Resources | Entity `_type`         | Entity `_class` |
 | --------- | ---------------------- | --------------- |
 | Project   | `sonarqube_project`    | `Project`       |
+| User      | `sonarqube_user`       | `User`          |
 | UserGroup | `sonarqube_user_group` | `UserGroup`     |
 
+### Relationships
+
+The following relationships are created/mapped:
+
+| Source Entity `_type`  | Relationship `_class` | Target Entity `_type` |
+| ---------------------- | --------------------- | --------------------- |
+| `sonarqube_user_group` | **HAS**               | `sonarqube_user`      |
+
 <!--
 ********************************************************************************
 END OF GENERATED DOCUMENTATION AFTER BELOW MARKER
diff --git a/src/provider/SonarqubeClient.test.ts b/src/provider/SonarqubeClient.test.ts
index 445a70b..64d97ce 100644
--- a/src/provider/SonarqubeClient.test.ts
+++ b/src/provider/SonarqubeClient.test.ts
@@ -7,9 +7,9 @@ import {
 } from '@jupiterone/integration-sdk-testing';
 
 import { createSonarqubeClient } from '.';
-import { SonarqubeProject, SonarqubeUserGroup } from './types';
+import { SonarqubeProject, SonarqubeUserGroup, SonarqubeUser } from './types';
 
-describe('#SonarqubeClient', () => {
+describe('#iterateResources', () => {
   let recording: Recording;
 
   afterEach(async () => {
@@ -19,7 +19,7 @@ describe('#SonarqubeClient', () => {
   test('should fail with invalid token', async () => {
     recording = setupRecording({
       directory: __dirname,
-      name: 'SonarqubeClientShouldFailWithInvalidToken',
+      name: 'iterateResourcesShouldFailWithInvalidToken',
       options: {
         matchRequestsBy: {
           url: {
@@ -44,6 +44,38 @@ describe('#SonarqubeClient', () => {
       }),
     ).rejects.toThrowError(IntegrationProviderAuthenticationError);
   });
+
+  test('should paginate correctly', async () => {
+    recording = setupRecording({
+      directory: __dirname,
+      name: 'iterateResourcesShouldPaginateCorrectly',
+      options: {
+        matchRequestsBy: {
+          url: {
+            hostname: false,
+          },
+        },
+        recordFailedRequests: true,
+      },
+      mutateEntry: mutations.unzipGzippedRecordingEntry,
+    });
+
+    const context = createMockStepExecutionContext({
+      instanceConfig: {
+        baseUrl: process.env.BASE_URL || 'http://localhost:9000',
+        apiToken: process.env.API_TOKEN || 'string-value',
+      },
+    });
+    const provider = createSonarqubeClient(context.instance.config);
+    const results: SonarqubeProject[] = [];
+    await provider.iterateProjects(
+      (project) => {
+        results.push(project);
+      },
+      { ps: '1' },
+    );
+    expect(results).toHaveLength(2);
+  });
 });
 
 describe('#iterateProjects', () => {
@@ -144,3 +176,118 @@ describe('#iterateUserGroups', () => {
     );
   });
 });
+
+describe('#iterateUsers', () => {
+  let recording: Recording;
+
+  afterEach(async () => {
+    await recording.stop();
+  });
+
+  test('should fetch users with valid config', async () => {
+    recording = setupRecording({
+      directory: __dirname,
+      name: 'iterateUsersShouldFetchUsersWithValidConfig',
+      options: {
+        matchRequestsBy: {
+          url: {
+            hostname: false,
+          },
+        },
+        recordFailedRequests: true,
+      },
+      mutateEntry: mutations.unzipGzippedRecordingEntry,
+    });
+
+    const context = createMockStepExecutionContext({
+      instanceConfig: {
+        baseUrl: process.env.BASE_URL || 'http://localhost:9000',
+        apiToken: process.env.API_TOKEN || 'string-value',
+      },
+    });
+    const provider = createSonarqubeClient(context.instance.config);
+
+    const results: SonarqubeUser[] = [];
+    await provider.iterateUsers((user) => {
+      results.push(user);
+    });
+
+    expect(results).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          login: expect.any(String),
+          name: expect.any(String),
+          active: expect.any(Boolean),
+          email: expect.any(String),
+          groups: expect.any(Array),
+          tokensCount: expect.any(Number),
+          local: expect.any(Boolean),
+          externalIdentity: expect.any(String),
+          externalProvider: expect.any(String),
+          avatar: expect.any(String),
+        }),
+        expect.objectContaining({
+          login: expect.any(String),
+          name: expect.any(String),
+          active: expect.any(Boolean),
+          email: expect.any(String),
+          groups: expect.any(Array),
+          tokensCount: expect.any(Number),
+          local: expect.any(Boolean),
+          externalIdentity: expect.any(String),
+          externalProvider: expect.any(String),
+          avatar: expect.any(String),
+        }),
+      ]),
+    );
+  });
+});
+
+describe('#iterateGroupsAssignedToUser', () => {
+  let recording: Recording;
+
+  afterEach(async () => {
+    await recording.stop();
+  });
+
+  test('should fetch users user groups with valid config', async () => {
+    recording = setupRecording({
+      directory: __dirname,
+      name: 'iterateGroupsAssignedToUserShouldFetchUserGroupsWithValidConfig',
+      options: {
+        matchRequestsBy: {
+          url: {
+            hostname: false,
+          },
+        },
+        recordFailedRequests: true,
+      },
+      mutateEntry: mutations.unzipGzippedRecordingEntry,
+    });
+
+    const context = createMockStepExecutionContext({
+      instanceConfig: {
+        baseUrl: process.env.BASE_URL || 'http://localhost:9000',
+        apiToken: process.env.API_TOKEN || 'string-value',
+      },
+    });
+    const provider = createSonarqubeClient(context.instance.config);
+
+    const results: SonarqubeUserGroup[] = [];
+    await provider.iterateGroupsAssignedToUser('testUser', (userGroup) => {
+      results.push(userGroup);
+    });
+
+    expect(results).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: expect.any(String),
+          name: expect.any(String),
+          description: expect.any(String),
+          selected: expect.any(Boolean),
+          default: expect.any(Boolean),
+        }),
+      ]),
+    );
+  });
+});
diff --git a/src/provider/SonarqubeClient.ts b/src/provider/SonarqubeClient.ts
index 3d8a233..daa6712 100644
--- a/src/provider/SonarqubeClient.ts
+++ b/src/provider/SonarqubeClient.ts
@@ -13,6 +13,7 @@ import {
   PaginatedResponse,
   ValidationResponse,
   SonarqubeUserGroup,
+  SonarqubeUser,
 } from './types';
 
 /**
@@ -42,21 +43,50 @@ export class SonarqubeClient {
 
   async iterateProjects(
     iteratee: ResourceIteratee<SonarqubeProject>,
+    params?: NodeJS.Dict<string | string[]>,
   ): Promise<void> {
     return this.iterateResources<'components', SonarqubeProject>(
       '/projects/search',
       'components',
       iteratee,
+      params,
     );
   }
 
   async iterateUserGroups(
     iteratee: ResourceIteratee<SonarqubeUserGroup>,
+    params?: NodeJS.Dict<string | string[]>,
   ): Promise<void> {
     return this.iterateResources<'groups', SonarqubeUserGroup>(
       '/user_groups/search',
       'groups',
       iteratee,
+      params,
+    );
+  }
+
+  async iterateUsers(
+    iteratee: ResourceIteratee<SonarqubeUser>,
+    params?: NodeJS.Dict<string | string[]>,
+  ): Promise<void> {
+    return this.iterateResources<'users', SonarqubeUser>(
+      '/users/search',
+      'users',
+      iteratee,
+      params,
+    );
+  }
+
+  async iterateGroupsAssignedToUser(
+    login: string,
+    iteratee: ResourceIteratee<SonarqubeUserGroup>,
+    params?: NodeJS.Dict<string | string[]>,
+  ): Promise<void> {
+    return this.iterateResources<'groups', SonarqubeUserGroup>(
+      '/users/groups',
+      'groups',
+      iteratee,
+      { login, ...params },
     );
   }
 
@@ -109,13 +139,15 @@ export class SonarqubeClient {
     endpoint: string,
     iterableObjectKey: T,
     iteratee: ResourceIteratee<U>,
+    params?: NodeJS.Dict<string | string[]>,
   ): Promise<void> {
     let page = 1;
 
     do {
       const searchParams = new URLSearchParams({
-        page: String(page),
-        per_page: String(ITEMS_PER_PAGE),
+        p: String(page),
+        ps: String(ITEMS_PER_PAGE),
+        ...params,
       });
 
       const parametizedEndpoint = `${endpoint}?${searchParams.toString()}`;
@@ -134,9 +166,9 @@ export class SonarqubeClient {
       }
 
       if (result[iterableObjectKey].length) {
-        page = 0; // stop pagination, we've reached the end of the line
-      } else {
         page += 1;
+      } else {
+        page = 0; // stop pagination, we've reached the end of the line
       }
     } while (page);
   }
diff --git a/src/provider/__recordings__/iterateGroupsAssignedToUserShouldFetchUserGroupsWithValidConfig_3568922689/recording.har b/src/provider/__recordings__/iterateGroupsAssignedToUserShouldFetchUserGroupsWithValidConfig_3568922689/recording.har
new file mode 100644
index 0000000..64b0dae
--- /dev/null
+++ b/src/provider/__recordings__/iterateGroupsAssignedToUserShouldFetchUserGroupsWithValidConfig_3568922689/recording.har
@@ -0,0 +1,248 @@
+{
+  "log": {
+    "_recordingName": "iterateGroupsAssignedToUserShouldFetchUserGroupsWithValidConfig",
+    "creator": {
+      "comment": "persister:JupiterOneIntegationFSPersister",
+      "name": "Polly.JS",
+      "version": "4.3.0"
+    },
+    "entries": [
+      {
+        "_id": "9fac340e26ad60199cd228dfa6444ba4",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 313,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "1"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            },
+            {
+              "name": "login",
+              "value": "testUser"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/groups?p=1&ps=100&login=testUser"
+        },
+        "response": {
+          "bodySize": 217,
+          "content": {
+            "mimeType": "application/json",
+            "size": 217,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":1},\"groups\":[{\"id\":\"AXkPpNolV6WlOKn23U7T\",\"name\":\"sonar-users\",\"description\":\"Any new users created will automatically join this group\",\"selected\":true,\"default\":true}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "217"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 18:33:59 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T18:33:59.607Z",
+        "time": 21,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 21
+        }
+      },
+      {
+        "_id": "42a11c35424ce5c71e96cd7da059ce9a",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 313,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            },
+            {
+              "name": "login",
+              "value": "testUser"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/groups?p=2&ps=100&login=testUser"
+        },
+        "response": {
+          "bodySize": 63,
+          "content": {
+            "mimeType": "application/json",
+            "size": 63,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":1},\"groups\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "63"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 18:33:59 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T18:33:59.630Z",
+        "time": 9,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 9
+        }
+      }
+    ],
+    "pages": [],
+    "version": "1.2"
+  }
+}
diff --git a/src/provider/__recordings__/iterateProjectsShouldFetchProjectsWithValidConfig_1902452194/recording.har b/src/provider/__recordings__/iterateProjectsShouldFetchProjectsWithValidConfig_1902452194/recording.har
index 32d4e7a..8bc7c34 100644
--- a/src/provider/__recordings__/iterateProjectsShouldFetchProjectsWithValidConfig_1902452194/recording.har
+++ b/src/provider/__recordings__/iterateProjectsShouldFetchProjectsWithValidConfig_1902452194/recording.har
@@ -8,7 +8,7 @@
     },
     "entries": [
       {
-        "_id": "2545f37658d1831edd318d3143667333",
+        "_id": "afa2e0ad675a0d044ee717045008a6eb",
         "_order": 0,
         "cache": {},
         "request": {
@@ -45,27 +45,27 @@
               "value": "localhost:9000"
             }
           ],
-          "headersSize": 310,
+          "headersSize": 301,
           "httpVersion": "HTTP/1.1",
           "method": "GET",
           "queryString": [
             {
-              "name": "page",
+              "name": "p",
               "value": "1"
             },
             {
-              "name": "per_page",
+              "name": "ps",
               "value": "100"
             }
           ],
-          "url": "http://localhost:9000/api/projects/search?page=1&per_page=100"
+          "url": "http://localhost:9000/api/projects/search?p=1&ps=100"
         },
         "response": {
-          "bodySize": 280,
+          "bodySize": 365,
           "content": {
             "mimeType": "application/json",
-            "size": 280,
-            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":1},\"components\":[{\"key\":\"escribirio_integration-test-repo\",\"name\":\"integration-test-repo\",\"qualifier\":\"TRK\",\"visibility\":\"public\",\"lastAnalysisDate\":\"2021-04-28T12:19:58+0000\",\"revision\":\"85444305d6f8efa62f3999b09f8a9a85d0fff02d\"}]}"
+            "size": 365,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":2},\"components\":[{\"key\":\"escribirio_integration-test-repo\",\"name\":\"integration-test-repo\",\"qualifier\":\"TRK\",\"visibility\":\"public\",\"lastAnalysisDate\":\"2021-04-28T12:19:58+0000\",\"revision\":\"85444305d6f8efa62f3999b09f8a9a85d0fff02d\"},{\"key\":\"test-project\",\"name\":\"test-project\",\"qualifier\":\"TRK\",\"visibility\":\"public\"}]}"
           },
           "cookies": [],
           "headers": [
@@ -91,11 +91,11 @@
             },
             {
               "name": "content-length",
-              "value": "280"
+              "value": "365"
             },
             {
               "name": "date",
-              "value": "Wed, 28 Apr 2021 13:52:10 GMT"
+              "value": "Thu, 29 Apr 2021 14:56:24 GMT"
             },
             {
               "name": "connection",
@@ -108,8 +108,8 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2021-04-28T13:52:10.283Z",
-        "time": 13,
+        "startedDateTime": "2021-04-29T14:56:24.675Z",
+        "time": 10,
         "timings": {
           "blocked": -1,
           "connect": -1,
@@ -117,7 +117,120 @@
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 13
+          "wait": 10
+        }
+      },
+      {
+        "_id": "0928a6c3731bd65341e5c488d2b59709",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 301,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/projects/search?p=2&ps=100"
+        },
+        "response": {
+          "bodySize": 67,
+          "content": {
+            "mimeType": "application/json",
+            "size": 67,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"components\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "67"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 14:59:53 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T14:59:53.626Z",
+        "time": 8,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 8
         }
       }
     ],
diff --git a/src/provider/__recordings__/SonarqubeClientShouldFailWithInvalidToken_1469573639/recording.har b/src/provider/__recordings__/iterateResourcesShouldFailWithInvalidToken_1367495729/recording.har
similarity index 85%
rename from src/provider/__recordings__/SonarqubeClientShouldFailWithInvalidToken_1469573639/recording.har
rename to src/provider/__recordings__/iterateResourcesShouldFailWithInvalidToken_1367495729/recording.har
index 5779699..d67be9a 100644
--- a/src/provider/__recordings__/SonarqubeClientShouldFailWithInvalidToken_1469573639/recording.har
+++ b/src/provider/__recordings__/iterateResourcesShouldFailWithInvalidToken_1367495729/recording.har
@@ -1,6 +1,6 @@
 {
   "log": {
-    "_recordingName": "SonarqubeClientShouldFailWithInvalidToken",
+    "_recordingName": "iterateResourcesShouldFailWithInvalidToken",
     "creator": {
       "comment": "persister:JupiterOneIntegationFSPersister",
       "name": "Polly.JS",
@@ -8,7 +8,7 @@
     },
     "entries": [
       {
-        "_id": "2545f37658d1831edd318d3143667333",
+        "_id": "afa2e0ad675a0d044ee717045008a6eb",
         "_order": 0,
         "cache": {},
         "request": {
@@ -45,20 +45,20 @@
               "value": "localhost:9000"
             }
           ],
-          "headersSize": 274,
+          "headersSize": 265,
           "httpVersion": "HTTP/1.1",
           "method": "GET",
           "queryString": [
             {
-              "name": "page",
+              "name": "p",
               "value": "1"
             },
             {
-              "name": "per_page",
+              "name": "ps",
               "value": "100"
             }
           ],
-          "url": "http://localhost:9000/api/projects/search?page=1&per_page=100"
+          "url": "http://localhost:9000/api/projects/search?p=1&ps=100"
         },
         "response": {
           "bodySize": 0,
@@ -86,7 +86,7 @@
             },
             {
               "name": "date",
-              "value": "Thu, 29 Apr 2021 12:57:16 GMT"
+              "value": "Thu, 29 Apr 2021 14:56:24 GMT"
             },
             {
               "name": "connection",
@@ -99,8 +99,8 @@
           "status": 401,
           "statusText": "Unauthorized"
         },
-        "startedDateTime": "2021-04-29T12:57:16.568Z",
-        "time": 20,
+        "startedDateTime": "2021-04-29T14:56:24.627Z",
+        "time": 17,
         "timings": {
           "blocked": -1,
           "connect": -1,
@@ -108,7 +108,7 @@
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 20
+          "wait": 17
         }
       }
     ],
diff --git a/src/provider/__recordings__/iterateResourcesShouldPaginateCorrectly_4072412313/recording.har b/src/provider/__recordings__/iterateResourcesShouldPaginateCorrectly_4072412313/recording.har
new file mode 100644
index 0000000..cf1e7dc
--- /dev/null
+++ b/src/provider/__recordings__/iterateResourcesShouldPaginateCorrectly_4072412313/recording.har
@@ -0,0 +1,353 @@
+{
+  "log": {
+    "_recordingName": "iterateResourcesShouldPaginateCorrectly",
+    "creator": {
+      "comment": "persister:JupiterOneIntegationFSPersister",
+      "name": "Polly.JS",
+      "version": "4.3.0"
+    },
+    "entries": [
+      {
+        "_id": "0c77ec9c721c0cf9c20425105be6df9d",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 299,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "1"
+            },
+            {
+              "name": "ps",
+              "value": "1"
+            }
+          ],
+          "url": "http://localhost:9000/api/projects/search?p=1&ps=1"
+        },
+        "response": {
+          "bodySize": 278,
+          "content": {
+            "mimeType": "application/json",
+            "size": 278,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":1,\"total\":2},\"components\":[{\"key\":\"escribirio_integration-test-repo\",\"name\":\"integration-test-repo\",\"qualifier\":\"TRK\",\"visibility\":\"public\",\"lastAnalysisDate\":\"2021-04-28T12:19:58+0000\",\"revision\":\"85444305d6f8efa62f3999b09f8a9a85d0fff02d\"}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "278"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 14:56:24 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T14:56:24.657Z",
+        "time": 10,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 10
+        }
+      },
+      {
+        "_id": "47c101193d68fe033414982c610742af",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 299,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "1"
+            }
+          ],
+          "url": "http://localhost:9000/api/projects/search?p=2&ps=1"
+        },
+        "response": {
+          "bodySize": 149,
+          "content": {
+            "mimeType": "application/json",
+            "size": 149,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":1,\"total\":2},\"components\":[{\"key\":\"test-project\",\"name\":\"test-project\",\"qualifier\":\"TRK\",\"visibility\":\"public\"}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "149"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 14:59:53 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T14:59:53.573Z",
+        "time": 26,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 26
+        }
+      },
+      {
+        "_id": "e837646f26221ea881480e5f37eca45d",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 299,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "3"
+            },
+            {
+              "name": "ps",
+              "value": "1"
+            }
+          ],
+          "url": "http://localhost:9000/api/projects/search?p=3&ps=1"
+        },
+        "response": {
+          "bodySize": 65,
+          "content": {
+            "mimeType": "application/json",
+            "size": 65,
+            "text": "{\"paging\":{\"pageIndex\":3,\"pageSize\":1,\"total\":2},\"components\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "65"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 14:59:53 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T14:59:53.602Z",
+        "time": 14,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 14
+        }
+      }
+    ],
+    "pages": [],
+    "version": "1.2"
+  }
+}
diff --git a/src/provider/__recordings__/iterateUserGroupsShouldFetchUserGroupsWithValidConfig_1034298020/recording.har b/src/provider/__recordings__/iterateUserGroupsShouldFetchUserGroupsWithValidConfig_1034298020/recording.har
index 6f0367a..1a73a50 100644
--- a/src/provider/__recordings__/iterateUserGroupsShouldFetchUserGroupsWithValidConfig_1034298020/recording.har
+++ b/src/provider/__recordings__/iterateUserGroupsShouldFetchUserGroupsWithValidConfig_1034298020/recording.har
@@ -8,7 +8,7 @@
     },
     "entries": [
       {
-        "_id": "8a49b5d504f234197e1cd616efb83230",
+        "_id": "4c5fe1f36c23db0a0869cc48e9fb22c0",
         "_order": 0,
         "cache": {},
         "request": {
@@ -45,20 +45,20 @@
               "value": "localhost:9000"
             }
           ],
-          "headersSize": 313,
+          "headersSize": 304,
           "httpVersion": "HTTP/1.1",
           "method": "GET",
           "queryString": [
             {
-              "name": "page",
+              "name": "p",
               "value": "1"
             },
             {
-              "name": "per_page",
+              "name": "ps",
               "value": "100"
             }
           ],
-          "url": "http://localhost:9000/api/user_groups/search?page=1&per_page=100"
+          "url": "http://localhost:9000/api/user_groups/search?p=1&ps=100"
         },
         "response": {
           "bodySize": 349,
@@ -95,7 +95,7 @@
             },
             {
               "name": "date",
-              "value": "Wed, 28 Apr 2021 16:41:24 GMT"
+              "value": "Thu, 29 Apr 2021 17:11:47 GMT"
             },
             {
               "name": "connection",
@@ -108,8 +108,8 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2021-04-28T16:41:24.511Z",
-        "time": 19,
+        "startedDateTime": "2021-04-29T17:11:47.075Z",
+        "time": 17,
         "timings": {
           "blocked": -1,
           "connect": -1,
@@ -117,7 +117,120 @@
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 19
+          "wait": 17
+        }
+      },
+      {
+        "_id": "275a1f10e4acd99c9d73a5b7ea3729c9",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 304,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/user_groups/search?p=2&ps=100"
+        },
+        "response": {
+          "bodySize": 63,
+          "content": {
+            "mimeType": "application/json",
+            "size": 63,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"groups\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "63"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 17:11:47 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T17:11:47.094Z",
+        "time": 10,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 10
         }
       }
     ],
diff --git a/src/provider/__recordings__/iterateUsersShouldFetchUsersWithValidConfig_1014868188/recording.har b/src/provider/__recordings__/iterateUsersShouldFetchUsersWithValidConfig_1014868188/recording.har
new file mode 100644
index 0000000..9bea459
--- /dev/null
+++ b/src/provider/__recordings__/iterateUsersShouldFetchUsersWithValidConfig_1014868188/recording.har
@@ -0,0 +1,240 @@
+{
+  "log": {
+    "_recordingName": "iterateUsersShouldFetchUsersWithValidConfig",
+    "creator": {
+      "comment": "persister:JupiterOneIntegationFSPersister",
+      "name": "Polly.JS",
+      "version": "4.3.0"
+    },
+    "entries": [
+      {
+        "_id": "defa6e4768bece4bd25a0a746586eedb",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 298,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "1"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/search?p=1&ps=100"
+        },
+        "response": {
+          "bodySize": 552,
+          "content": {
+            "mimeType": "application/json",
+            "size": 552,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":2},\"users\":[{\"login\":\"admin\",\"name\":\"Administrator\",\"active\":true,\"groups\":[\"sonar-administrators\",\"sonar-users\"],\"tokensCount\":3,\"local\":true,\"externalIdentity\":\"admin\",\"externalProvider\":\"sonarqube\",\"lastConnectionDate\":\"2021-04-29T14:36:46+0000\"},{\"login\":\"testUser\",\"name\":\"kenanwarren\",\"active\":true,\"email\":\"kenan.warren@jupiterone.com\",\"groups\":[\"sonar-users\"],\"tokensCount\":0,\"local\":true,\"externalIdentity\":\"testUser\",\"externalProvider\":\"sonarqube\",\"avatar\":\"1894ec27fc39e5557aae3f4e2af24d45\"}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "552"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 14:56:24 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T14:56:24.703Z",
+        "time": 18,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 18
+        }
+      },
+      {
+        "_id": "f6e1abd1107fea9c5496446667ca0ff3",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 298,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/search?p=2&ps=100"
+        },
+        "response": {
+          "bodySize": 62,
+          "content": {
+            "mimeType": "application/json",
+            "size": 62,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"users\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "62"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 14:59:53 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T14:59:53.657Z",
+        "time": 11,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 11
+        }
+      }
+    ],
+    "pages": [],
+    "version": "1.2"
+  }
+}
diff --git a/src/provider/types.ts b/src/provider/types.ts
index ac6bca9..0289a5f 100644
--- a/src/provider/types.ts
+++ b/src/provider/types.ts
@@ -11,10 +11,24 @@ export interface SonarqubeUserGroup {
   id: string; // This value is unique but is NOT what ties relationships to users
   name: string; // This value is unique and is what ties relationships to users
   description: string;
-  membersCount: number;
+  membersCount?: number;
+  selected?: string;
   default: boolean;
 }
 
+export interface SonarqubeUser {
+  login: string;
+  name: string;
+  active: boolean;
+  email: string;
+  groups: string[];
+  tokensCount: number;
+  local: boolean;
+  externalIdentity: string;
+  externalProvider: string;
+  avatar: string;
+}
+
 export interface Pagination {
   pageIndex: number;
   pageSize: number;
diff --git a/src/steps/constants.ts b/src/steps/constants.ts
index 0c75565..2fcd482 100644
--- a/src/steps/constants.ts
+++ b/src/steps/constants.ts
@@ -1,6 +1,10 @@
+import { RelationshipClass } from '@jupiterone/integration-sdk-core';
+
 export const Steps = {
   PROJECTS: 'fetch-projects',
   USER_GROUPS: 'fetch-user-groups',
+  USERS: 'fetch-users',
+  BUILD_USER_GROUP_HAS_USER: 'build-user-group-has-user',
 };
 
 export const Entities = {
@@ -14,4 +18,18 @@ export const Entities = {
     _type: 'sonarqube_user_group',
     _class: ['UserGroup'],
   },
+  USER: {
+    resourceName: 'User',
+    _type: 'sonarqube_user',
+    _class: ['User'],
+  },
+};
+
+export const Relationships = {
+  GROUP_HAS_USER: {
+    _type: 'sonarqube_user_group_has_user',
+    sourceType: Entities.USER_GROUP._type,
+    _class: RelationshipClass.HAS,
+    targetType: Entities.USER._type,
+  },
 };
diff --git a/src/steps/index.ts b/src/steps/index.ts
index 0c0a77d..c136221 100644
--- a/src/steps/index.ts
+++ b/src/steps/index.ts
@@ -6,9 +6,10 @@ import {
 import { SonarqubeIntegrationConfig } from '../types';
 import { projectSteps } from './project';
 import { userGroupSteps } from './user-group';
+import { userSteps } from './user';
 
 const integrationSteps: Step<
   IntegrationStepExecutionContext<SonarqubeIntegrationConfig>
->[] = [...projectSteps, ...userGroupSteps];
+>[] = [...projectSteps, ...userGroupSteps, ...userSteps];
 
 export { integrationSteps };
diff --git a/src/steps/project/__recordings__/fetchProjectsShouldCollectData_2137769016/recording.har b/src/steps/project/__recordings__/fetchProjectsShouldCollectData_2137769016/recording.har
index 3b76ce7..af67d49 100644
--- a/src/steps/project/__recordings__/fetchProjectsShouldCollectData_2137769016/recording.har
+++ b/src/steps/project/__recordings__/fetchProjectsShouldCollectData_2137769016/recording.har
@@ -8,7 +8,7 @@
     },
     "entries": [
       {
-        "_id": "2545f37658d1831edd318d3143667333",
+        "_id": "afa2e0ad675a0d044ee717045008a6eb",
         "_order": 0,
         "cache": {},
         "request": {
@@ -45,27 +45,27 @@
               "value": "localhost:9000"
             }
           ],
-          "headersSize": 310,
+          "headersSize": 301,
           "httpVersion": "HTTP/1.1",
           "method": "GET",
           "queryString": [
             {
-              "name": "page",
+              "name": "p",
               "value": "1"
             },
             {
-              "name": "per_page",
+              "name": "ps",
               "value": "100"
             }
           ],
-          "url": "http://localhost:9000/api/projects/search?page=1&per_page=100"
+          "url": "http://localhost:9000/api/projects/search?p=1&ps=100"
         },
         "response": {
-          "bodySize": 280,
+          "bodySize": 365,
           "content": {
             "mimeType": "application/json",
-            "size": 280,
-            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":1},\"components\":[{\"key\":\"escribirio_integration-test-repo\",\"name\":\"integration-test-repo\",\"qualifier\":\"TRK\",\"visibility\":\"public\",\"lastAnalysisDate\":\"2021-04-28T12:19:58+0000\",\"revision\":\"85444305d6f8efa62f3999b09f8a9a85d0fff02d\"}]}"
+            "size": 365,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":2},\"components\":[{\"key\":\"escribirio_integration-test-repo\",\"name\":\"integration-test-repo\",\"qualifier\":\"TRK\",\"visibility\":\"public\",\"lastAnalysisDate\":\"2021-04-28T12:19:58+0000\",\"revision\":\"85444305d6f8efa62f3999b09f8a9a85d0fff02d\"},{\"key\":\"test-project\",\"name\":\"test-project\",\"qualifier\":\"TRK\",\"visibility\":\"public\"}]}"
           },
           "cookies": [],
           "headers": [
@@ -91,11 +91,11 @@
             },
             {
               "name": "content-length",
-              "value": "280"
+              "value": "365"
             },
             {
               "name": "date",
-              "value": "Wed, 28 Apr 2021 13:52:10 GMT"
+              "value": "Thu, 29 Apr 2021 14:56:24 GMT"
             },
             {
               "name": "connection",
@@ -108,8 +108,8 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2021-04-28T13:52:10.243Z",
-        "time": 26,
+        "startedDateTime": "2021-04-29T14:56:24.600Z",
+        "time": 28,
         "timings": {
           "blocked": -1,
           "connect": -1,
@@ -117,7 +117,120 @@
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 26
+          "wait": 28
+        }
+      },
+      {
+        "_id": "0928a6c3731bd65341e5c488d2b59709",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 301,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/projects/search?p=2&ps=100"
+        },
+        "response": {
+          "bodySize": 67,
+          "content": {
+            "mimeType": "application/json",
+            "size": 67,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"components\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "67"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 15:00:35 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T15:00:35.190Z",
+        "time": 23,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 23
         }
       }
     ],
diff --git a/src/steps/project/converter.test.ts b/src/steps/project/converter.test.ts
index a08abc0..8e6ec06 100644
--- a/src/steps/project/converter.test.ts
+++ b/src/steps/project/converter.test.ts
@@ -16,7 +16,7 @@ describe('#createProjectEntity', () => {
 
     expect(entity).toEqual(
       expect.objectContaining({
-        _key: 'project-key-1',
+        _key: 'sonarqube-project:project-key-1',
         _type: 'sonarqube_project',
         _class: ['Project'],
         key: 'project-key-1',
diff --git a/src/steps/project/converter.ts b/src/steps/project/converter.ts
index 32d377c..3831c57 100644
--- a/src/steps/project/converter.ts
+++ b/src/steps/project/converter.ts
@@ -6,12 +6,17 @@ import {
 import { Entities } from '../constants';
 import { SonarqubeProject } from '../../provider/types';
 
+const PROJECT_KEY_PREFIX = 'sonarqube-project';
+export function createProjectEntityIdentifier(key: string): string {
+  return `${PROJECT_KEY_PREFIX}:${key}`;
+}
+
 export function createProjectEntity(project: SonarqubeProject): Entity {
   return createIntegrationEntity({
     entityData: {
       source: project,
       assign: {
-        _key: project.key,
+        _key: createProjectEntityIdentifier(project.key),
         _type: Entities.PROJECT._type,
         _class: Entities.PROJECT._class,
         id: project.key,
diff --git a/src/steps/project/index.test.ts b/src/steps/project/index.test.ts
index 67f1935..1b25875 100644
--- a/src/steps/project/index.test.ts
+++ b/src/steps/project/index.test.ts
@@ -33,20 +33,28 @@ describe('#fetchProjects', () => {
     });
     await fetchProjects(context);
 
-    expect(context.jobState.collectedEntities).toHaveLength(1);
+    expect(context.jobState.collectedEntities).toHaveLength(2);
     expect(context.jobState.collectedRelationships).toHaveLength(0);
-    expect(context.jobState.collectedEntities).toEqual([
-      expect.objectContaining({
-        _key: expect.any(String),
-        _class: ['Project'],
-        _type: 'sonarqube_project',
-        key: expect.any(String),
-        name: expect.any(String),
-        qualifier: expect.any(String),
-        revision: expect.any(String),
-        visibility: expect.any(String),
-        lastAnalysisDate: expect.any(String),
-      }),
-    ]);
+    expect(context.jobState.collectedEntities).toMatchGraphObjectSchema({
+      _class: ['Project'],
+      schema: {
+        additionalProperties: true,
+        properties: {
+          _type: { const: 'sonarqube_project' },
+          _key: { type: 'string' },
+          key: { type: 'string' },
+          name: { type: 'string' },
+          qualifier: { type: 'string' },
+          revision: { type: 'string' },
+          visibility: { type: 'string' },
+          lastAnalysisDate: { type: 'string' },
+          _rawData: {
+            type: 'array',
+            items: { type: 'object' },
+          },
+        },
+        required: ['name'],
+      },
+    });
   });
 });
diff --git a/src/steps/project/index.ts b/src/steps/project/index.ts
index e405b51..e2df6a2 100644
--- a/src/steps/project/index.ts
+++ b/src/steps/project/index.ts
@@ -7,7 +7,6 @@ import {
 import { Entities, Steps } from '../constants';
 import { createProjectEntity } from './converter';
 import { createSonarqubeClient } from '../../provider';
-import { SonarqubeProject } from '../../provider/types';
 import { SonarqubeIntegrationConfig } from '../../types';
 
 export async function fetchProjects({
@@ -15,21 +14,12 @@ export async function fetchProjects({
   jobState,
 }: IntegrationStepExecutionContext<SonarqubeIntegrationConfig>) {
   const client = createSonarqubeClient(instance.config);
-  const projectKeys = new Set<string>();
-  const addProjectEntity = async (
-    project: SonarqubeProject,
-  ): Promise<Entity> => {
-    const projectEntity = createProjectEntity(project);
-    if (!projectKeys.has(projectEntity._key)) {
-      await jobState.addEntity(projectEntity);
-      projectKeys.add(projectEntity._key);
-    }
-    return projectEntity;
-  };
 
-  await client.iterateProjects(async (project) => {
-    await addProjectEntity(project);
+  const convertedProjects: Entity[] = [];
+  await client.iterateProjects((project) => {
+    convertedProjects.push(createProjectEntity(project));
   });
+  await jobState.addEntities(convertedProjects);
 }
 
 export const projectSteps: IntegrationStep<SonarqubeIntegrationConfig>[] = [
diff --git a/src/steps/user-group/__recordings__/fetchUserGroupsShouldCollectData_1142389439/recording.har b/src/steps/user-group/__recordings__/fetchUserGroupsShouldCollectData_1142389439/recording.har
index 292b754..99ce240 100644
--- a/src/steps/user-group/__recordings__/fetchUserGroupsShouldCollectData_1142389439/recording.har
+++ b/src/steps/user-group/__recordings__/fetchUserGroupsShouldCollectData_1142389439/recording.har
@@ -8,7 +8,7 @@
     },
     "entries": [
       {
-        "_id": "8a49b5d504f234197e1cd616efb83230",
+        "_id": "4c5fe1f36c23db0a0869cc48e9fb22c0",
         "_order": 0,
         "cache": {},
         "request": {
@@ -45,20 +45,20 @@
               "value": "localhost:9000"
             }
           ],
-          "headersSize": 313,
+          "headersSize": 304,
           "httpVersion": "HTTP/1.1",
           "method": "GET",
           "queryString": [
             {
-              "name": "page",
+              "name": "p",
               "value": "1"
             },
             {
-              "name": "per_page",
+              "name": "ps",
               "value": "100"
             }
           ],
-          "url": "http://localhost:9000/api/user_groups/search?page=1&per_page=100"
+          "url": "http://localhost:9000/api/user_groups/search?p=1&ps=100"
         },
         "response": {
           "bodySize": 349,
@@ -95,7 +95,7 @@
             },
             {
               "name": "date",
-              "value": "Wed, 28 Apr 2021 16:41:24 GMT"
+              "value": "Thu, 29 Apr 2021 14:56:24 GMT"
             },
             {
               "name": "connection",
@@ -108,8 +108,8 @@
           "status": 200,
           "statusText": "OK"
         },
-        "startedDateTime": "2021-04-28T16:41:24.487Z",
-        "time": 38,
+        "startedDateTime": "2021-04-29T14:56:24.600Z",
+        "time": 34,
         "timings": {
           "blocked": -1,
           "connect": -1,
@@ -117,7 +117,120 @@
           "receive": 0,
           "send": 0,
           "ssl": -1,
-          "wait": 38
+          "wait": 34
+        }
+      },
+      {
+        "_id": "275a1f10e4acd99c9d73a5b7ea3729c9",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 304,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/user_groups/search?p=2&ps=100"
+        },
+        "response": {
+          "bodySize": 63,
+          "content": {
+            "mimeType": "application/json",
+            "size": 63,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"groups\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "63"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 15:00:35 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T15:00:35.190Z",
+        "time": 23,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 23
         }
       }
     ],
diff --git a/src/steps/user-group/converter.test.ts b/src/steps/user-group/converter.test.ts
index bc846c1..d513d11 100644
--- a/src/steps/user-group/converter.test.ts
+++ b/src/steps/user-group/converter.test.ts
@@ -15,7 +15,7 @@ describe('#createUserGroupEntity', () => {
 
     expect(entity).toEqual(
       expect.objectContaining({
-        _key: 'user-group-id-1',
+        _key: 'sonarqube-user-group:user-group-id-1',
         _type: 'sonarqube_user_group',
         _class: ['UserGroup'],
         id: 'user-group-id-1',
diff --git a/src/steps/user-group/converter.ts b/src/steps/user-group/converter.ts
index eae3b0f..86cc92f 100644
--- a/src/steps/user-group/converter.ts
+++ b/src/steps/user-group/converter.ts
@@ -6,12 +6,17 @@ import {
 import { Entities } from '../constants';
 import { SonarqubeUserGroup } from '../../provider/types';
 
+const USER_GROUP_ID_PREFIX = 'sonarqube-user-group';
+export function createUserGroupEntityIdentifier(id: string): string {
+  return `${USER_GROUP_ID_PREFIX}:${id}`;
+}
+
 export function createUserGroupEntity(userGroup: SonarqubeUserGroup): Entity {
   return createIntegrationEntity({
     entityData: {
       source: userGroup,
       assign: {
-        _key: userGroup.id,
+        _key: createUserGroupEntityIdentifier(userGroup.id),
         _type: Entities.USER_GROUP._type,
         _class: Entities.USER_GROUP._class,
         id: userGroup.id,
diff --git a/src/steps/user-group/index.test.ts b/src/steps/user-group/index.test.ts
index c97c3b5..08e1255 100644
--- a/src/steps/user-group/index.test.ts
+++ b/src/steps/user-group/index.test.ts
@@ -35,27 +35,25 @@ describe('#fetchUserGroups', () => {
 
     expect(context.jobState.collectedEntities).toHaveLength(2);
     expect(context.jobState.collectedRelationships).toHaveLength(0);
-    expect(context.jobState.collectedEntities).toEqual([
-      expect.objectContaining({
-        _key: expect.any(String),
-        _class: ['UserGroup'],
-        _type: 'sonarqube_user_group',
-        id: expect.any(String),
-        name: expect.any(String),
-        description: expect.any(String),
-        membersCount: expect.any(Number),
-        default: expect.any(Boolean),
-      }),
-      expect.objectContaining({
-        _key: expect.any(String),
-        _class: ['UserGroup'],
-        _type: 'sonarqube_user_group',
-        id: expect.any(String),
-        name: expect.any(String),
-        description: expect.any(String),
-        membersCount: expect.any(Number),
-        default: expect.any(Boolean),
-      }),
-    ]);
+    expect(context.jobState.collectedEntities).toMatchGraphObjectSchema({
+      _class: ['UserGroup'],
+      schema: {
+        additionalProperties: true,
+        properties: {
+          _type: { const: 'sonarqube_user_group' },
+          _key: { type: 'string' },
+          id: { type: 'string' },
+          name: { type: 'string' },
+          description: { type: 'string' },
+          membersCount: { type: 'number' },
+          default: { type: 'boolean' },
+          _rawData: {
+            type: 'array',
+            items: { type: 'object' },
+          },
+        },
+        required: ['name'],
+      },
+    });
   });
 });
diff --git a/src/steps/user-group/index.ts b/src/steps/user-group/index.ts
index 0f4ebbf..712c602 100644
--- a/src/steps/user-group/index.ts
+++ b/src/steps/user-group/index.ts
@@ -7,7 +7,6 @@ import {
 import { Entities, Steps } from '../constants';
 import { createUserGroupEntity } from './converter';
 import { createSonarqubeClient } from '../../provider';
-import { SonarqubeUserGroup } from '../../provider/types';
 import { SonarqubeIntegrationConfig } from '../../types';
 
 export async function fetchUserGroups({
@@ -15,21 +14,12 @@ export async function fetchUserGroups({
   jobState,
 }: IntegrationStepExecutionContext<SonarqubeIntegrationConfig>) {
   const client = createSonarqubeClient(instance.config);
-  const userGroupKeys = new Set<string>();
-  const addUserGroupEntity = async (
-    userGroup: SonarqubeUserGroup,
-  ): Promise<Entity> => {
-    const userGroupEntity = createUserGroupEntity(userGroup);
-    if (!userGroupKeys.has(userGroupEntity._key)) {
-      await jobState.addEntity(userGroupEntity);
-      userGroupKeys.add(userGroupEntity._key);
-    }
-    return userGroupEntity;
-  };
 
-  await client.iterateUserGroups(async (userGroup) => {
-    await addUserGroupEntity(userGroup);
+  const convertedUserGroups: Entity[] = [];
+  await client.iterateUserGroups((userGroup) => {
+    convertedUserGroups.push(createUserGroupEntity(userGroup));
   });
+  await jobState.addEntities(convertedUserGroups);
 }
 
 export const userGroupSteps: IntegrationStep<SonarqubeIntegrationConfig>[] = [
diff --git a/src/steps/user/__recordings__/buildUserGroupUserRelationshipsShouldCollectData_4207018598/recording.har b/src/steps/user/__recordings__/buildUserGroupUserRelationshipsShouldCollectData_4207018598/recording.har
new file mode 100644
index 0000000..bc6c2f4
--- /dev/null
+++ b/src/steps/user/__recordings__/buildUserGroupUserRelationshipsShouldCollectData_4207018598/recording.har
@@ -0,0 +1,934 @@
+{
+  "log": {
+    "_recordingName": "buildUserGroupUserRelationshipsShouldCollectData",
+    "creator": {
+      "comment": "persister:JupiterOneIntegationFSPersister",
+      "name": "Polly.JS",
+      "version": "4.3.0"
+    },
+    "entries": [
+      {
+        "_id": "defa6e4768bece4bd25a0a746586eedb",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 298,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "1"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/search?p=1&ps=100"
+        },
+        "response": {
+          "bodySize": 552,
+          "content": {
+            "mimeType": "application/json",
+            "size": 552,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":2},\"users\":[{\"login\":\"admin\",\"name\":\"Administrator\",\"active\":true,\"groups\":[\"sonar-administrators\",\"sonar-users\"],\"tokensCount\":3,\"local\":true,\"externalIdentity\":\"admin\",\"externalProvider\":\"sonarqube\",\"lastConnectionDate\":\"2021-04-29T16:05:58+0000\"},{\"login\":\"testUser\",\"name\":\"kenanwarren\",\"active\":true,\"email\":\"kenan.warren@jupiterone.com\",\"groups\":[\"sonar-users\"],\"tokensCount\":0,\"local\":true,\"externalIdentity\":\"testUser\",\"externalProvider\":\"sonarqube\",\"avatar\":\"1894ec27fc39e5557aae3f4e2af24d45\"}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "552"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 16:59:11 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T16:59:11.345Z",
+        "time": 18,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 18
+        }
+      },
+      {
+        "_id": "f6e1abd1107fea9c5496446667ca0ff3",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 298,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/search?p=2&ps=100"
+        },
+        "response": {
+          "bodySize": 62,
+          "content": {
+            "mimeType": "application/json",
+            "size": 62,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"users\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "62"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 16:59:11 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T16:59:11.365Z",
+        "time": 10,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 10
+        }
+      },
+      {
+        "_id": "4c5fe1f36c23db0a0869cc48e9fb22c0",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 304,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "1"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/user_groups/search?p=1&ps=100"
+        },
+        "response": {
+          "bodySize": 349,
+          "content": {
+            "mimeType": "application/json",
+            "size": 349,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":2},\"groups\":[{\"id\":\"AXkPpNolV6WlOKn23U7S\",\"name\":\"sonar-administrators\",\"description\":\"System administrators\",\"membersCount\":1,\"default\":false},{\"id\":\"AXkPpNolV6WlOKn23U7T\",\"name\":\"sonar-users\",\"description\":\"Any new users created will automatically join this group\",\"membersCount\":2,\"default\":true}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "349"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 16:59:11 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T16:59:11.376Z",
+        "time": 10,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 10
+        }
+      },
+      {
+        "_id": "275a1f10e4acd99c9d73a5b7ea3729c9",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 304,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/user_groups/search?p=2&ps=100"
+        },
+        "response": {
+          "bodySize": 63,
+          "content": {
+            "mimeType": "application/json",
+            "size": 63,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"groups\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "63"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 16:59:11 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T16:59:11.389Z",
+        "time": 9,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 9
+        }
+      },
+      {
+        "_id": "5907e26de1d3237901b31720dd2d3e37",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 310,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "1"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            },
+            {
+              "name": "login",
+              "value": "admin"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/groups?p=1&ps=100&login=admin"
+        },
+        "response": {
+          "bodySize": 347,
+          "content": {
+            "mimeType": "application/json",
+            "size": 347,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":2},\"groups\":[{\"id\":\"AXkPpNolV6WlOKn23U7S\",\"name\":\"sonar-administrators\",\"description\":\"System administrators\",\"selected\":true,\"default\":false},{\"id\":\"AXkPpNolV6WlOKn23U7T\",\"name\":\"sonar-users\",\"description\":\"Any new users created will automatically join this group\",\"selected\":true,\"default\":true}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "347"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 17:01:03 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T17:01:03.332Z",
+        "time": 19,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 19
+        }
+      },
+      {
+        "_id": "eff1ac9e71fb36268c620e2b184dbf9b",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 310,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            },
+            {
+              "name": "login",
+              "value": "admin"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/groups?p=2&ps=100&login=admin"
+        },
+        "response": {
+          "bodySize": 63,
+          "content": {
+            "mimeType": "application/json",
+            "size": 63,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"groups\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "63"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 17:01:03 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T17:01:03.362Z",
+        "time": 14,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 14
+        }
+      },
+      {
+        "_id": "9fac340e26ad60199cd228dfa6444ba4",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 313,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "1"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            },
+            {
+              "name": "login",
+              "value": "testUser"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/groups?p=1&ps=100&login=testUser"
+        },
+        "response": {
+          "bodySize": 217,
+          "content": {
+            "mimeType": "application/json",
+            "size": 217,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":1},\"groups\":[{\"id\":\"AXkPpNolV6WlOKn23U7T\",\"name\":\"sonar-users\",\"description\":\"Any new users created will automatically join this group\",\"selected\":true,\"default\":true}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "217"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 17:01:03 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T17:01:03.377Z",
+        "time": 10,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 10
+        }
+      },
+      {
+        "_id": "42a11c35424ce5c71e96cd7da059ce9a",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 313,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            },
+            {
+              "name": "login",
+              "value": "testUser"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/groups?p=2&ps=100&login=testUser"
+        },
+        "response": {
+          "bodySize": 63,
+          "content": {
+            "mimeType": "application/json",
+            "size": 63,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":1},\"groups\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "63"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 17:01:03 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T17:01:03.389Z",
+        "time": 8,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 8
+        }
+      }
+    ],
+    "pages": [],
+    "version": "1.2"
+  }
+}
diff --git a/src/steps/user/__recordings__/fetchUsersShouldCollectData_357354744/recording.har b/src/steps/user/__recordings__/fetchUsersShouldCollectData_357354744/recording.har
new file mode 100644
index 0000000..5985021
--- /dev/null
+++ b/src/steps/user/__recordings__/fetchUsersShouldCollectData_357354744/recording.har
@@ -0,0 +1,240 @@
+{
+  "log": {
+    "_recordingName": "fetchUsersShouldCollectData",
+    "creator": {
+      "comment": "persister:JupiterOneIntegationFSPersister",
+      "name": "Polly.JS",
+      "version": "4.3.0"
+    },
+    "entries": [
+      {
+        "_id": "defa6e4768bece4bd25a0a746586eedb",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 298,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "1"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/search?p=1&ps=100"
+        },
+        "response": {
+          "bodySize": 552,
+          "content": {
+            "mimeType": "application/json",
+            "size": 552,
+            "text": "{\"paging\":{\"pageIndex\":1,\"pageSize\":100,\"total\":2},\"users\":[{\"login\":\"admin\",\"name\":\"Administrator\",\"active\":true,\"groups\":[\"sonar-administrators\",\"sonar-users\"],\"tokensCount\":3,\"local\":true,\"externalIdentity\":\"admin\",\"externalProvider\":\"sonarqube\",\"lastConnectionDate\":\"2021-04-29T16:05:58+0000\"},{\"login\":\"testUser\",\"name\":\"kenanwarren\",\"active\":true,\"email\":\"kenan.warren@jupiterone.com\",\"groups\":[\"sonar-users\"],\"tokensCount\":0,\"local\":true,\"externalIdentity\":\"testUser\",\"externalProvider\":\"sonarqube\",\"avatar\":\"1894ec27fc39e5557aae3f4e2af24d45\"}]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "552"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 16:59:11 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 258,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T16:59:11.285Z",
+        "time": 26,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 26
+        }
+      },
+      {
+        "_id": "f6e1abd1107fea9c5496446667ca0ff3",
+        "_order": 0,
+        "cache": {},
+        "request": {
+          "bodySize": 0,
+          "cookies": [],
+          "headers": [
+            {
+              "_fromType": "array",
+              "name": "authorization",
+              "value": "[REDACTED]"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept",
+              "value": "*/*"
+            },
+            {
+              "_fromType": "array",
+              "name": "user-agent",
+              "value": "node-fetch/1.0 (+https://github.com/bitinn/node-fetch)"
+            },
+            {
+              "_fromType": "array",
+              "name": "accept-encoding",
+              "value": "gzip,deflate"
+            },
+            {
+              "_fromType": "array",
+              "name": "connection",
+              "value": "close"
+            },
+            {
+              "name": "host",
+              "value": "localhost:9000"
+            }
+          ],
+          "headersSize": 298,
+          "httpVersion": "HTTP/1.1",
+          "method": "GET",
+          "queryString": [
+            {
+              "name": "p",
+              "value": "2"
+            },
+            {
+              "name": "ps",
+              "value": "100"
+            }
+          ],
+          "url": "http://localhost:9000/api/users/search?p=2&ps=100"
+        },
+        "response": {
+          "bodySize": 62,
+          "content": {
+            "mimeType": "application/json",
+            "size": 62,
+            "text": "{\"paging\":{\"pageIndex\":2,\"pageSize\":100,\"total\":2},\"users\":[]}"
+          },
+          "cookies": [],
+          "headers": [
+            {
+              "name": "x-frame-options",
+              "value": "SAMEORIGIN"
+            },
+            {
+              "name": "x-xss-protection",
+              "value": "1; mode=block"
+            },
+            {
+              "name": "x-content-type-options",
+              "value": "nosniff"
+            },
+            {
+              "name": "cache-control",
+              "value": "no-cache, no-store, must-revalidate"
+            },
+            {
+              "name": "content-type",
+              "value": "application/json"
+            },
+            {
+              "name": "content-length",
+              "value": "62"
+            },
+            {
+              "name": "date",
+              "value": "Thu, 29 Apr 2021 16:59:11 GMT"
+            },
+            {
+              "name": "connection",
+              "value": "close"
+            }
+          ],
+          "headersSize": 257,
+          "httpVersion": "HTTP/1.1",
+          "redirectURL": "",
+          "status": 200,
+          "statusText": "OK"
+        },
+        "startedDateTime": "2021-04-29T16:59:11.322Z",
+        "time": 14,
+        "timings": {
+          "blocked": -1,
+          "connect": -1,
+          "dns": -1,
+          "receive": 0,
+          "send": 0,
+          "ssl": -1,
+          "wait": 14
+        }
+      }
+    ],
+    "pages": [],
+    "version": "1.2"
+  }
+}
diff --git a/src/steps/user/converter.test.ts b/src/steps/user/converter.test.ts
new file mode 100644
index 0000000..4d07222
--- /dev/null
+++ b/src/steps/user/converter.test.ts
@@ -0,0 +1,44 @@
+import { createUserEntity } from './converter';
+import { SonarqubeUser } from '../../provider/types';
+
+describe('#createUserEntity', () => {
+  test('should convert to entity', () => {
+    const user = {
+      login: 'userlogin1',
+      name: 'User Name 1',
+      active: true,
+      email: 'user1@email.org',
+      groups: ['user-group-1'],
+      tokensCount: 0,
+      local: true,
+      externalIdentity: 'userlogin1',
+      externalProvider: 'sonarqube',
+    } as SonarqubeUser;
+
+    const entity = createUserEntity(user);
+
+    expect(entity).toEqual(
+      expect.objectContaining({
+        _key: 'sonarqube-user:userlogin1',
+        _type: 'sonarqube_user',
+        _class: ['User'],
+        username: 'userlogin1',
+        email: 'user1@email.org',
+        shortLoginId: 'userlogin1',
+        name: 'User Name 1',
+        login: 'userlogin1',
+        active: true,
+        tokensCount: 0,
+        local: true,
+        externalIdentity: 'userlogin1',
+        externalProvider: 'sonarqube',
+        _rawData: [
+          {
+            name: 'default',
+            rawData: user,
+          },
+        ],
+      }),
+    );
+  });
+});
diff --git a/src/steps/user/converter.ts b/src/steps/user/converter.ts
new file mode 100644
index 0000000..4b9744b
--- /dev/null
+++ b/src/steps/user/converter.ts
@@ -0,0 +1,36 @@
+import {
+  createIntegrationEntity,
+  Entity,
+} from '@jupiterone/integration-sdk-core';
+
+import { Entities } from '../constants';
+import { SonarqubeUser } from '../../provider/types';
+
+const USER_LOGIN_PREFIX = 'sonarqube-user';
+export function createUserEntityIdentifier(login: string): string {
+  return `${USER_LOGIN_PREFIX}:${login}`;
+}
+
+export function createUserEntity(user: SonarqubeUser): Entity {
+  return createIntegrationEntity({
+    entityData: {
+      source: user,
+      assign: {
+        _key: createUserEntityIdentifier(user.login),
+        _type: Entities.USER._type,
+        _class: Entities.USER._class,
+        username: user.login,
+        email: user.email,
+        shortLoginId: user.login,
+        name: user.name,
+        login: user.login,
+        active: user.active,
+        tokensCount: user.tokensCount,
+        local: user.local,
+        externalIdentity: user.externalIdentity,
+        externalProvider: user.externalProvider,
+        avatar: user.avatar,
+      },
+    },
+  });
+}
diff --git a/src/steps/user/index.test.ts b/src/steps/user/index.test.ts
new file mode 100644
index 0000000..924dcdc
--- /dev/null
+++ b/src/steps/user/index.test.ts
@@ -0,0 +1,111 @@
+import { RelationshipClass } from '@jupiterone/integration-sdk-core';
+import {
+  createMockStepExecutionContext,
+  Recording,
+  setupRecording,
+} from '@jupiterone/integration-sdk-testing';
+import { buildUserGroupUserRelationships, fetchUsers } from '.';
+import { fetchUserGroups } from '../user-group';
+import { Relationships } from '../constants';
+
+describe('#fetchUsers', () => {
+  let recording: Recording;
+
+  afterEach(async () => {
+    await recording.stop();
+  });
+
+  test('should collect data', async () => {
+    recording = setupRecording({
+      directory: __dirname,
+      name: 'fetchUsersShouldCollectData',
+      options: {
+        matchRequestsBy: {
+          url: {
+            hostname: false,
+          },
+        },
+      },
+    });
+
+    const context = createMockStepExecutionContext({
+      instanceConfig: {
+        baseUrl: process.env.BASE_URL || 'http://localhost:9000',
+        apiToken: process.env.API_TOKEN || 'string-value',
+      },
+    });
+    await fetchUsers(context);
+
+    expect(context.jobState.collectedEntities).toHaveLength(2);
+    expect(context.jobState.collectedRelationships).toHaveLength(0);
+    expect(context.jobState.collectedEntities).toMatchGraphObjectSchema({
+      _class: ['User'],
+      schema: {
+        additionalProperties: true,
+        properties: {
+          _type: { const: 'sonarqube_user' },
+          _key: { type: 'string' },
+          username: { type: 'string' },
+          shortLoginId: { type: 'string' },
+          name: { type: 'string' },
+          active: { type: 'boolean' },
+          tokensCount: { type: 'number' },
+          local: { type: 'boolean' },
+          externalIdentity: { type: 'string' },
+          externalProvider: { type: 'string' },
+          _rawData: {
+            type: 'array',
+            items: { type: 'object' },
+          },
+        },
+        required: ['login'],
+      },
+    });
+  });
+});
+
+describe('#buildUserGroupUserRelationships', () => {
+  let recording: Recording;
+
+  afterEach(async () => {
+    await recording.stop();
+  });
+
+  test('should collect data', async () => {
+    recording = setupRecording({
+      directory: __dirname,
+      name: 'buildUserGroupUserRelationshipsShouldCollectData',
+      options: {
+        matchRequestsBy: {
+          url: {
+            hostname: false,
+          },
+        },
+      },
+    });
+
+    const context = createMockStepExecutionContext({
+      instanceConfig: {
+        baseUrl: process.env.BASE_URL || 'http://localhost:9000',
+        apiToken: process.env.API_TOKEN || 'string-value',
+      },
+    });
+    await fetchUsers(context);
+    await fetchUserGroups(context);
+    await buildUserGroupUserRelationships(context);
+
+    expect(context.jobState.collectedRelationships).toHaveLength(3);
+    expect(
+      context.jobState.collectedRelationships.filter(
+        (r) => r._type === Relationships.GROUP_HAS_USER._type,
+      ),
+    ).toMatchDirectRelationshipSchema({
+      schema: {
+        properties: {
+          _class: { const: RelationshipClass.HAS },
+          _type: { const: Relationships.GROUP_HAS_USER._type },
+        },
+      },
+    });
+  });
+});
diff --git a/src/steps/user/index.ts b/src/steps/user/index.ts
new file mode 100644
index 0000000..09c1988
--- /dev/null
+++ b/src/steps/user/index.ts
@@ -0,0 +1,92 @@
+import {
+  createDirectRelationship,
+  Entity,
+  IntegrationMissingKeyError,
+  IntegrationStep,
+  IntegrationStepExecutionContext,
+  Relationship,
+  RelationshipClass,
+} from '@jupiterone/integration-sdk-core';
+
+import { Entities, Steps, Relationships } from '../constants';
+import { createUserEntity } from './converter';
+import { createUserGroupEntityIdentifier } from '../user-group/converter';
+import { createSonarqubeClient } from '../../provider';
+import { SonarqubeIntegrationConfig } from '../../types';
+
+export function createUserGroupUserRelationship(
+  userGroup: Entity,
+  user: Entity,
+): Relationship {
+  return createDirectRelationship({
+    _class: RelationshipClass.HAS,
+    from: userGroup,
+    to: user,
+  });
+}
+
+export async function fetchUsers({
+  instance,
+  jobState,
+}: IntegrationStepExecutionContext<SonarqubeIntegrationConfig>) {
+  const client = createSonarqubeClient(instance.config);
+
+  const convertedUsers: Entity[] = [];
+  await client.iterateUsers((user) => {
+    convertedUsers.push(createUserEntity(user));
+  });
+  await jobState.addEntities(convertedUsers);
+}
+
+export async function buildUserGroupUserRelationships({
+  instance,
+  jobState,
+}: IntegrationStepExecutionContext<SonarqubeIntegrationConfig>) {
+  const client = createSonarqubeClient(instance.config);
+  await jobState.iterateEntities(
+    { _type: Entities.USER._type },
+    async (userEntity) => {
+      await client.iterateGroupsAssignedToUser(
+        userEntity.login as string,
+        async (userGroup) => {
+          const userGroupEntityId = createUserGroupEntityIdentifier(
+            userGroup.id,
+          );
+          const userGroupEntity = await jobState.findEntity(userGroupEntityId);
+
+          if (!userGroupEntity) {
+            throw new IntegrationMissingKeyError(
+              `Expected user group with key to exist (key=${userGroupEntityId})`,
+            );
+          }
+
+          await jobState.addRelationship(
+            createDirectRelationship({
+              _class: RelationshipClass.HAS,
+              from: userGroupEntity,
+              to: userEntity,
+            }),
+          );
+        },
+      );
+    },
+  );
+}
+
+export const userSteps: IntegrationStep<SonarqubeIntegrationConfig>[] = [
+  {
+    id: Steps.USERS,
+    name: 'Users',
+    entities: [Entities.USER],
+    executionHandler: fetchUsers,
+    relationships: [Relationships.GROUP_HAS_USER],
+  },
+  {
+    id: Steps.BUILD_USER_GROUP_HAS_USER,
+    name: 'Build user group user relationship',
+    entities: [],
+    executionHandler: buildUserGroupUserRelationships,
+    relationships: [Relationships.GROUP_HAS_USER],
+    dependsOn: [Steps.USER_GROUPS, Steps.USERS],
+  },
+];
diff --git a/test/schemas.ts b/test/schemas.ts
deleted file mode 100644
index a11b94b..0000000
--- a/test/schemas.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { GraphObjectSchema } from '@jupiterone/integration-sdk-testing';
-
-export const projectClass = ['Project'];
-export const projectSchema: GraphObjectSchema = {
-  additionalProperties: false,
-  properties: {
-    _key: { type: 'string' },
-    _class: { const: projectClass },
-    _type: { const: 'sonarqube_project' },
-    _rawData: { type: 'array', items: { type: 'object' } },
-    id: { type: 'string' },
-    qualifier: { type: 'string' },
-    visibility: { type: 'string' },
-    lastAnalysisDate: { type: 'string' },
-    revision: { type: 'string' },
-    displayName: { type: 'string' },
-  },
-};