From e29561064e0200a59fbfe9b10c38714697519338 Mon Sep 17 00:00:00 2001
From: Mihael Safaric <mihael.safaric@gmail.com>
Date: Tue, 17 Sep 2024 16:47:21 +0200
Subject: [PATCH] Improve handling Pagination

---
 projects/ngx-hal/package.json                 |   2 +-
 .../ngx-hal/src/lib/classes/hal-document.ts   |  12 +-
 .../classes/hal-storage/etag-hal-storage.ts   |  32 +-
 .../hal-storage/hal-storage-factory.ts        |  11 +-
 .../lib/classes/hal-storage/hal-storage.ts    |  34 +-
 .../classes/hal-storage/simple-hal-storage.ts |   9 +-
 .../src/lib/decorators/attribute.decorator.ts |  10 +-
 .../decorators/datastore-config.decorator.ts  |   7 +-
 .../src/lib/decorators/has-many.decorator.ts  |   7 +-
 .../src/lib/decorators/has-one.decorator.ts   |   7 +-
 .../decorators/header-attribute.decorator.ts  |   7 +-
 .../src/lib/decorators/link.decorator.ts      |   5 +-
 .../lib/decorators/model-config.decorator.ts  |   9 +-
 .../interfaces/attribute-options.interface.ts |   5 +-
 .../interfaces/datastore-options.interface.ts |  10 +-
 .../interfaces/has-many-options.interface.ts  |   5 +-
 .../interfaces/has-one-options.interface.ts   |   5 +-
 .../header-attribute-options.interface.ts     |   5 +-
 .../lib/interfaces/model-options.interface.ts |   7 +-
 projects/ngx-hal/src/lib/models/hal.model.ts  |  45 ++-
 .../services/datastore/datastore.service.ts   | 329 +++++++++---------
 .../services/model-service/model.service.ts   |  18 +-
 .../lib/types/hal-document-construtor.type.ts |   5 +-
 .../src/lib/types/model-constructor.type.ts   |   7 +-
 .../ngx-hal/src/lib/types/pagination.type.ts  |   3 -
 25 files changed, 321 insertions(+), 275 deletions(-)
 delete mode 100644 projects/ngx-hal/src/lib/types/pagination.type.ts

diff --git a/projects/ngx-hal/package.json b/projects/ngx-hal/package.json
index 9c11fb8..813a792 100644
--- a/projects/ngx-hal/package.json
+++ b/projects/ngx-hal/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "ngx-hal",
-	"version": "3.1.1",
+	"version": "4.0.0-beta",
 	"description": "Angular library for supporting HAL format APIs",
 	"author": "Infinum <javascript.team@infinum.co>",
 	"license": "MIT",
diff --git a/projects/ngx-hal/src/lib/classes/hal-document.ts b/projects/ngx-hal/src/lib/classes/hal-document.ts
index 81d84c4..8e6a511 100644
--- a/projects/ngx-hal/src/lib/classes/hal-document.ts
+++ b/projects/ngx-hal/src/lib/classes/hal-document.ts
@@ -17,16 +17,16 @@ import { RequestOptions } from '../types/request-options.type';
 import { RelationshipRequestDescriptor } from '../types/relationship-request-descriptor.type';
 import { generateUUID } from '../helpers/uuid/uuid.helper';
 
-export class HalDocument<T extends HalModel> {
+export class HalDocument<T extends HalModel<P>, P extends Pagination> {
 	public models: Array<T>;
-	public pagination: Pagination;
+	public pagination: P;
 	public uniqueModelIdentificator: string;
 
 	constructor(
 		private rawResource: RawHalResource,
 		private rawResponse: HttpResponse<any>,
-		private modelClass: ModelConstructor<T>,
-		private datastore: DatastoreService,
+		private modelClass: ModelConstructor<T, P>,
+		private datastore: DatastoreService<P>,
 	) {
 		this.parseRawResources(rawResource);
 		this.generateUniqueModelIdentificator();
@@ -50,7 +50,7 @@ export class HalDocument<T extends HalModel> {
 		includeRelationships: Array<string | RelationshipRequestDescriptor> = [],
 		requestOptions: RequestOptions = {},
 		subsequentRequestsOptions: RequestOptions = {},
-	): Observable<HalDocument<T>> {
+	): Observable<HalDocument<T, P>> {
 		requestOptions.params = requestOptions.params || {};
 
 		if (pageNumber || pageNumber === 0) {
@@ -82,7 +82,7 @@ export class HalDocument<T extends HalModel> {
 		});
 	}
 
-	private generatePagination(pagination: RawHalResource): Pagination {
+	private generatePagination(pagination: RawHalResource): P {
 		if (!this.datastore.paginationClass) {
 			return null;
 		}
diff --git a/projects/ngx-hal/src/lib/classes/hal-storage/etag-hal-storage.ts b/projects/ngx-hal/src/lib/classes/hal-storage/etag-hal-storage.ts
index cee819f..a61801c 100644
--- a/projects/ngx-hal/src/lib/classes/hal-storage/etag-hal-storage.ts
+++ b/projects/ngx-hal/src/lib/classes/hal-storage/etag-hal-storage.ts
@@ -1,22 +1,23 @@
-import { HalModel } from '../../models/hal.model';
-import { HalDocument } from './../hal-document';
 import { HttpResponse } from '@angular/common/http';
+import { HalModel } from '../../models/hal.model';
 import { RequestOptions } from '../../types/request-options.type';
-import { HalStorage } from './hal-storage';
 import { setRequestHeader } from '../../utils/set-request-header/set-request-header.util';
+import { Pagination } from '../pagination';
+import { HalDocument } from './../hal-document';
+import { HalStorage } from './hal-storage';
 
-export interface EtagStorageModel<T extends HalModel> {
-	model: T | HalDocument<T>;
+export interface EtagStorageModel<T extends HalModel<P>, P extends Pagination> {
+	model: T | HalDocument<T, P>;
 	etag: string;
 }
 
-export class EtagHalStorage extends HalStorage {
-	public save<T extends HalModel>(
-		model: T | HalDocument<T>,
+export class EtagHalStorage<P extends Pagination> extends HalStorage<P> {
+	public save<T extends HalModel<P>>(
+		model: T | HalDocument<T, P>,
 		response?: HttpResponse<T>,
 		alternateUniqueIdentificators: Array<string> = [],
-	): Array<EtagStorageModel<T>> {
-		const storedModels: Array<EtagStorageModel<T>> = [];
+	): Array<EtagStorageModel<T, P>> {
+		const storedModels: Array<EtagStorageModel<T, P>> = [];
 
 		const identificators: Array<string> = [].concat(alternateUniqueIdentificators);
 		identificators.push(model.uniqueModelIdentificator);
@@ -33,8 +34,8 @@ export class EtagHalStorage extends HalStorage {
 		return storedModels;
 	}
 
-	public get<T extends HalModel>(uniqueModelIdentificator: string): T | HalDocument<T> {
-		const localModel: EtagStorageModel<T> = this.getRawStorageModel(uniqueModelIdentificator);
+	public get<T extends HalModel<P>>(uniqueModelIdentificator: string): T | HalDocument<T, P> {
+		const localModel: EtagStorageModel<T, P> = this.getRawStorageModel(uniqueModelIdentificator);
 		return localModel ? localModel.model : undefined;
 	}
 
@@ -42,7 +43,8 @@ export class EtagHalStorage extends HalStorage {
 		uniqueModelIdentificator: string,
 		requestOptions: RequestOptions,
 	): void {
-		const storageModel: EtagStorageModel<any> = this.getRawStorageModel(uniqueModelIdentificator);
+		const storageModel: EtagStorageModel<any, P> =
+			this.getRawStorageModel(uniqueModelIdentificator);
 
 		if (!storageModel) {
 			return;
@@ -57,9 +59,9 @@ export class EtagHalStorage extends HalStorage {
 		}
 	}
 
-	protected getRawStorageModel<T extends HalModel>(
+	protected getRawStorageModel<T extends HalModel<P>>(
 		uniqueModelIdentificator: string,
-	): EtagStorageModel<T> {
+	): EtagStorageModel<T, P> {
 		return this.internalStorage[uniqueModelIdentificator];
 	}
 
diff --git a/projects/ngx-hal/src/lib/classes/hal-storage/hal-storage-factory.ts b/projects/ngx-hal/src/lib/classes/hal-storage/hal-storage-factory.ts
index ae0fcde..ad33457 100644
--- a/projects/ngx-hal/src/lib/classes/hal-storage/hal-storage-factory.ts
+++ b/projects/ngx-hal/src/lib/classes/hal-storage/hal-storage-factory.ts
@@ -2,14 +2,15 @@ import { CacheStrategy } from '../../enums/cache-strategy.enum';
 import { SimpleHalStorage } from '../../classes/hal-storage/simple-hal-storage';
 import { EtagHalStorage } from '../../classes/hal-storage/etag-hal-storage';
 import { HalStorage } from './hal-storage';
+import { Pagination } from '../pagination';
 
-export type HalStorageType = SimpleHalStorage | EtagHalStorage;
+export type HalStorageType<P extends Pagination> = SimpleHalStorage<P> | EtagHalStorage<P>;
 
-export function createHalStorage(
+export function createHalStorage<P extends Pagination>(
 	cacheStrategy: CacheStrategy = CacheStrategy.NONE,
-	storageInstance: HalStorage,
-): HalStorageType {
-	let storage: HalStorageType;
+	storageInstance: HalStorage<P>,
+): HalStorageType<P> {
+	let storage: HalStorageType<P>;
 
 	switch (cacheStrategy) {
 		case CacheStrategy.NONE:
diff --git a/projects/ngx-hal/src/lib/classes/hal-storage/hal-storage.ts b/projects/ngx-hal/src/lib/classes/hal-storage/hal-storage.ts
index 65e51c6..8e1b29a 100644
--- a/projects/ngx-hal/src/lib/classes/hal-storage/hal-storage.ts
+++ b/projects/ngx-hal/src/lib/classes/hal-storage/hal-storage.ts
@@ -1,22 +1,28 @@
-import { HalModel } from '../../models/hal.model';
-import { HalDocument } from './../hal-document';
 import { HttpResponse } from '@angular/common/http';
-import { RequestOptions } from '../../types/request-options.type';
 import { Observable } from 'rxjs';
+import { HalModel } from '../../models/hal.model';
 import { ModelConstructor, ModelConstructorFn } from '../../types/model-constructor.type';
+import { RequestOptions } from '../../types/request-options.type';
+import { Pagination } from '../pagination';
+import { HalDocument } from './../hal-document';
 
-export abstract class HalStorage {
+export abstract class HalStorage<P extends Pagination> {
 	protected internalStorage: { [K: string]: any } = {};
 
-	public abstract save<T extends HalModel>(
-		model: T | HalDocument<T>,
+	public abstract save<T extends HalModel<P>>(
+		model: T | HalDocument<T, P>,
 		response?: HttpResponse<T>,
 		alternateUniqueIdentificators?: Array<string>,
 	): void;
 
-	public abstract get<T extends HalModel>(uniqueModelIdentificator: string): T | HalDocument<T>;
+	public abstract get<T extends HalModel<P>>(
+		uniqueModelIdentificator: string,
+	): T | HalDocument<T, P>;
 
-	public saveAll<T extends HalModel>(models: Array<T>, savePartialModels: boolean = false): void {
+	public saveAll<T extends HalModel<P>>(
+		models: Array<T>,
+		savePartialModels: boolean = false,
+	): void {
 		models.forEach((model: T) => {
 			if (savePartialModels || !this.get(model.uniqueModelIdentificator)) {
 				this.save(model);
@@ -24,7 +30,7 @@ export abstract class HalStorage {
 		});
 	}
 
-	public remove(model: HalModel): void {
+	public remove(model: HalModel<P>): void {
 		delete this.internalStorage[model.uniqueModelIdentificator];
 	}
 
@@ -35,13 +41,13 @@ export abstract class HalStorage {
 		// noop
 	}
 
-	public makeGetRequestWrapper?<T extends HalModel>(
+	public makeGetRequestWrapper?<T extends HalModel<P>>(
 		urls: { originalUrl: string; cleanUrl: string; urlWithParams: string },
-		cachedResource: T | HalDocument<T>,
-		originalGetRequest$: Observable<T | HalDocument<T>>,
+		cachedResource: T | HalDocument<T, P>,
+		originalGetRequest$: Observable<T | HalDocument<T, P>>,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		storePartialModels?: boolean,
-	): Observable<T | HalDocument<T>>;
+	): Observable<T | HalDocument<T, P>>;
 }
diff --git a/projects/ngx-hal/src/lib/classes/hal-storage/simple-hal-storage.ts b/projects/ngx-hal/src/lib/classes/hal-storage/simple-hal-storage.ts
index 4270baa..d6df02f 100644
--- a/projects/ngx-hal/src/lib/classes/hal-storage/simple-hal-storage.ts
+++ b/projects/ngx-hal/src/lib/classes/hal-storage/simple-hal-storage.ts
@@ -2,10 +2,11 @@ import { HttpResponse } from '@angular/common/http';
 import { HalModel } from '../../models/hal.model';
 import { HalDocument } from './../hal-document';
 import { HalStorage } from './hal-storage';
+import { Pagination } from '../pagination';
 
-export class SimpleHalStorage extends HalStorage {
-	public save<T extends HalModel>(
-		model: T | HalDocument<T>,
+export class SimpleHalStorage<P extends Pagination> extends HalStorage<P> {
+	public save<T extends HalModel<P>>(
+		model: T | HalDocument<T, P>,
 		response?: HttpResponse<T>,
 		alternateUniqueIdentificators: Array<string> = [],
 	): void {
@@ -17,7 +18,7 @@ export class SimpleHalStorage extends HalStorage {
 		});
 	}
 
-	public get<T extends HalModel>(uniqueModelIdentificator: string): T | HalDocument<T> {
+	public get<T extends HalModel<P>>(uniqueModelIdentificator: string): T | HalDocument<T, P> {
 		return this.internalStorage[uniqueModelIdentificator];
 	}
 }
diff --git a/projects/ngx-hal/src/lib/decorators/attribute.decorator.ts b/projects/ngx-hal/src/lib/decorators/attribute.decorator.ts
index 95a25f5..8db9979 100644
--- a/projects/ngx-hal/src/lib/decorators/attribute.decorator.ts
+++ b/projects/ngx-hal/src/lib/decorators/attribute.decorator.ts
@@ -1,3 +1,4 @@
+import { Pagination } from '../classes/pagination';
 import { ATTRIBUTE_PROPERTIES_METADATA_KEY } from '../constants/metadata.constant';
 import { ModelProperty as ModelPropertyEnum } from '../enums/model-property.enum';
 import { getObjProperty } from '../helpers/metadata/metadata.helper';
@@ -10,9 +11,12 @@ import { AttributeModelProperty } from '../interfaces/model-property.interface';
 import { HalModel } from '../models/hal.model';
 import { deepmergeWrapper } from '../utils/deepmerge-wrapper';
 
-export function Attribute(options: AttributeOptions = {}) {
-	return (model: HalModel, propertyName: string) => {
-		const attributeOptions: AttributeOptions = deepmergeWrapper(DEFAULT_ATTRIBUTE_OPTIONS, options);
+export function Attribute<P extends Pagination>(options: AttributeOptions<P> = {}) {
+	return (model: HalModel<P>, propertyName: string) => {
+		const attributeOptions: AttributeOptions<P> = deepmergeWrapper(
+			DEFAULT_ATTRIBUTE_OPTIONS,
+			options,
+		);
 		const existingAttributeProperties: Array<AttributeModelProperty> = getObjProperty(
 			model,
 			ATTRIBUTE_PROPERTIES_METADATA_KEY,
diff --git a/projects/ngx-hal/src/lib/decorators/datastore-config.decorator.ts b/projects/ngx-hal/src/lib/decorators/datastore-config.decorator.ts
index ca56dc1..39e1ed4 100644
--- a/projects/ngx-hal/src/lib/decorators/datastore-config.decorator.ts
+++ b/projects/ngx-hal/src/lib/decorators/datastore-config.decorator.ts
@@ -1,10 +1,11 @@
-import { DatastoreOptions } from '../interfaces/datastore-options.interface';
+import { Pagination } from '../classes/pagination';
 import { HAL_DATASTORE_DOCUMENT_CLASS_METADATA_KEY } from '../constants/metadata.constant';
+import { setObjProperty } from '../helpers/metadata/metadata.helper';
+import { DatastoreOptions } from '../interfaces/datastore-options.interface';
 import { DEFAULT_NETWORK_CONFIG, NetworkConfig } from '../interfaces/network-config.interface';
 import { deepmergeWrapper } from '../utils/deepmerge-wrapper';
-import { setObjProperty } from '../helpers/metadata/metadata.helper';
 
-export function DatastoreConfig(config: DatastoreOptions) {
+export function DatastoreConfig<P extends Pagination>(config: DatastoreOptions<P>) {
 	return function (target: any) {
 		const networkConfig = deepmergeWrapper<NetworkConfig>(
 			DEFAULT_NETWORK_CONFIG,
diff --git a/projects/ngx-hal/src/lib/decorators/has-many.decorator.ts b/projects/ngx-hal/src/lib/decorators/has-many.decorator.ts
index 1cca174..0b2266f 100644
--- a/projects/ngx-hal/src/lib/decorators/has-many.decorator.ts
+++ b/projects/ngx-hal/src/lib/decorators/has-many.decorator.ts
@@ -1,3 +1,4 @@
+import { Pagination } from '../classes/pagination';
 import { HAS_MANY_PROPERTIES_METADATA_KEY } from '../constants/metadata.constant';
 import { ModelProperty } from '../enums/model-property.enum';
 import { getObjProperty } from '../helpers/metadata/metadata.helper';
@@ -7,9 +8,9 @@ import { HasManyModelProperty } from '../interfaces/model-property.interface';
 import { HalModel } from '../models/hal.model';
 import { deepmergeWrapper } from '../utils/deepmerge-wrapper';
 
-export function HasMany(options: HasManyOptions) {
-	return (model: HalModel, propertyName: string) => {
-		const hasManyOptions: HasManyOptions = deepmergeWrapper(DEFAULT_HAS_MANY_OPTIONS, options);
+export function HasMany<P extends Pagination>(options: HasManyOptions<P>) {
+	return (model: HalModel<P>, propertyName: string) => {
+		const hasManyOptions: HasManyOptions<P> = deepmergeWrapper(DEFAULT_HAS_MANY_OPTIONS, options);
 
 		const existingHasManyProperties: Array<HasManyModelProperty> = getObjProperty(
 			model,
diff --git a/projects/ngx-hal/src/lib/decorators/has-one.decorator.ts b/projects/ngx-hal/src/lib/decorators/has-one.decorator.ts
index 2c322a8..acbfbfc 100644
--- a/projects/ngx-hal/src/lib/decorators/has-one.decorator.ts
+++ b/projects/ngx-hal/src/lib/decorators/has-one.decorator.ts
@@ -1,3 +1,4 @@
+import { Pagination } from '../classes/pagination';
 import { HAS_ONE_PROPERTIES_METADATA_KEY } from '../constants/metadata.constant';
 import { ModelProperty } from '../enums/model-property.enum';
 import { getObjProperty } from '../helpers/metadata/metadata.helper';
@@ -7,9 +8,9 @@ import { HasOneModelProperty } from '../interfaces/model-property.interface';
 import { HalModel } from '../models/hal.model';
 import { deepmergeWrapper } from '../utils/deepmerge-wrapper';
 
-export function HasOne(options: HasOneOptions) {
-	return (model: HalModel, propertyName: string) => {
-		const hasOneOptions: HasOneOptions = deepmergeWrapper(DEFAULT_HAS_ONE_OPTIONS, options);
+export function HasOne<P extends Pagination>(options: HasOneOptions<P>) {
+	return (model: HalModel<P>, propertyName: string) => {
+		const hasOneOptions: HasOneOptions<P> = deepmergeWrapper(DEFAULT_HAS_ONE_OPTIONS, options);
 
 		const existingHasOneProperties: Array<HasOneModelProperty> = getObjProperty(
 			model,
diff --git a/projects/ngx-hal/src/lib/decorators/header-attribute.decorator.ts b/projects/ngx-hal/src/lib/decorators/header-attribute.decorator.ts
index c367c5e..e72e5a4 100644
--- a/projects/ngx-hal/src/lib/decorators/header-attribute.decorator.ts
+++ b/projects/ngx-hal/src/lib/decorators/header-attribute.decorator.ts
@@ -1,3 +1,4 @@
+import { Pagination } from '../classes/pagination';
 import { HEADER_ATTRIBUTE_PROPERTIES_METADATA_KEY } from '../constants/metadata.constant';
 import { ModelProperty as ModelPropertyEnum } from '../enums/model-property.enum';
 import { getObjProperty } from '../helpers/metadata/metadata.helper';
@@ -13,9 +14,9 @@ import {
 import { HalModel } from '../models/hal.model';
 import { deepmergeWrapper } from '../utils/deepmerge-wrapper';
 
-export function HeaderAttribute(options: HeaderAttributeOptions = {}) {
-	return (model: HalModel, propertyName: string) => {
-		const headerAttributeOptions: HeaderAttributeOptions = deepmergeWrapper(
+export function HeaderAttribute<P extends Pagination>(options: HeaderAttributeOptions<P> = {}) {
+	return (model: HalModel<P>, propertyName: string) => {
+		const headerAttributeOptions: HeaderAttributeOptions<P> = deepmergeWrapper(
 			DEFAULT_HEADER_ATTRIBUTE_OPTIONS,
 			options,
 		);
diff --git a/projects/ngx-hal/src/lib/decorators/link.decorator.ts b/projects/ngx-hal/src/lib/decorators/link.decorator.ts
index 9039c42..5412d34 100644
--- a/projects/ngx-hal/src/lib/decorators/link.decorator.ts
+++ b/projects/ngx-hal/src/lib/decorators/link.decorator.ts
@@ -1,3 +1,4 @@
+import { Pagination } from '../classes/pagination';
 import { LINK_PROPERTIES_METADATA_KEY } from '../constants/metadata.constant';
 import { ModelProperty } from '../enums/model-property.enum';
 import { getObjProperty } from '../helpers/metadata/metadata.helper';
@@ -6,8 +7,8 @@ import { LinkRelationshipOptions } from '../interfaces/link-relationship-options
 import { LinkProperty } from '../interfaces/model-property.interface';
 import { HalModel } from '../models/hal.model';
 
-export function Link(options: LinkRelationshipOptions = {}) {
-	return (model: HalModel, propertyName: string) => {
+export function Link<P extends Pagination>(options: LinkRelationshipOptions = {}) {
+	return (model: HalModel<P>, propertyName: string) => {
 		const existingLinkProperties: Array<LinkProperty> = getObjProperty(
 			model,
 			LINK_PROPERTIES_METADATA_KEY,
diff --git a/projects/ngx-hal/src/lib/decorators/model-config.decorator.ts b/projects/ngx-hal/src/lib/decorators/model-config.decorator.ts
index c46502b..44d9dbc 100644
--- a/projects/ngx-hal/src/lib/decorators/model-config.decorator.ts
+++ b/projects/ngx-hal/src/lib/decorators/model-config.decorator.ts
@@ -1,11 +1,12 @@
-import { ModelOptions, DEFAULT_MODEL_OPTIONS } from '../interfaces/model-options.interface';
+import { Pagination } from '../classes/pagination';
 import { HAL_MODEL_DOCUMENT_CLASS_METADATA_KEY } from '../constants/metadata.constant';
-import { deepmergeWrapper } from '../utils/deepmerge-wrapper';
 import { setObjProperty } from '../helpers/metadata/metadata.helper';
+import { DEFAULT_MODEL_OPTIONS, ModelOptions } from '../interfaces/model-options.interface';
+import { deepmergeWrapper } from '../utils/deepmerge-wrapper';
 
-export function ModelConfig(config: ModelOptions) {
+export function ModelConfig<P extends Pagination>(config: ModelOptions<P>) {
 	return function (target: any) {
-		const configValue = deepmergeWrapper<ModelOptions>(DEFAULT_MODEL_OPTIONS, config);
+		const configValue = deepmergeWrapper<ModelOptions<P>>(DEFAULT_MODEL_OPTIONS, config);
 		Object.defineProperty(target.prototype, 'config', {
 			value: configValue,
 			writable: true,
diff --git a/projects/ngx-hal/src/lib/interfaces/attribute-options.interface.ts b/projects/ngx-hal/src/lib/interfaces/attribute-options.interface.ts
index 883416a..930843d 100644
--- a/projects/ngx-hal/src/lib/interfaces/attribute-options.interface.ts
+++ b/projects/ngx-hal/src/lib/interfaces/attribute-options.interface.ts
@@ -1,7 +1,8 @@
+import { Pagination } from '../classes/pagination';
 import { ModelConstructor, ModelConstructorFn } from '../types/model-constructor.type';
 
-export interface AttributeOptions {
-	useClass?: string | ModelConstructor<any> | ModelConstructorFn<any>;
+export interface AttributeOptions<P extends Pagination> {
+	useClass?: string | ModelConstructor<any, P> | ModelConstructorFn<any, P>;
 	transformResponseValue?: (rawAttribute: any) => any;
 	transformBeforeSave?: (raw: any) => any;
 	externalName?: string;
diff --git a/projects/ngx-hal/src/lib/interfaces/datastore-options.interface.ts b/projects/ngx-hal/src/lib/interfaces/datastore-options.interface.ts
index e39c63a..5d6f7ba 100644
--- a/projects/ngx-hal/src/lib/interfaces/datastore-options.interface.ts
+++ b/projects/ngx-hal/src/lib/interfaces/datastore-options.interface.ts
@@ -1,14 +1,14 @@
 import { NetworkConfig } from './network-config.interface';
 import { HalModel } from '../models/hal.model';
 import { HalDocumentConstructor } from '../types/hal-document-construtor.type';
-import { PaginationConstructor } from '../types/pagination.type';
 import { CacheStrategy } from '../enums/cache-strategy.enum';
 import { HalStorage } from '../classes/hal-storage/hal-storage';
+import { Pagination } from '../classes/pagination';
 
-export interface DatastoreOptions {
+export interface DatastoreOptions<P extends Pagination> {
 	network?: NetworkConfig;
-	halDocumentClass?: HalDocumentConstructor<HalModel>;
-	paginationClass?: PaginationConstructor;
+	halDocumentClass?: HalDocumentConstructor<HalModel<P>, P>;
+	paginationClass?: { new (...args): P };
 	cacheStrategy?: CacheStrategy;
-	storage?: HalStorage;
+	storage?: HalStorage<P>;
 }
diff --git a/projects/ngx-hal/src/lib/interfaces/has-many-options.interface.ts b/projects/ngx-hal/src/lib/interfaces/has-many-options.interface.ts
index 5f2929f..ba08233 100644
--- a/projects/ngx-hal/src/lib/interfaces/has-many-options.interface.ts
+++ b/projects/ngx-hal/src/lib/interfaces/has-many-options.interface.ts
@@ -1,7 +1,8 @@
+import { Pagination } from '../classes/pagination';
 import { ModelConstructor, ModelConstructorFn } from '../types/model-constructor.type';
 
-export interface HasManyOptions {
-	itemsType: string | ModelConstructor<any> | ModelConstructorFn<any>;
+export interface HasManyOptions<P extends Pagination> {
+	itemsType: string | ModelConstructor<any, P> | ModelConstructorFn<any, P>;
 	includeInPayload?: boolean;
 	externalName?: string;
 }
diff --git a/projects/ngx-hal/src/lib/interfaces/has-one-options.interface.ts b/projects/ngx-hal/src/lib/interfaces/has-one-options.interface.ts
index 3f99528..41d1744 100644
--- a/projects/ngx-hal/src/lib/interfaces/has-one-options.interface.ts
+++ b/projects/ngx-hal/src/lib/interfaces/has-one-options.interface.ts
@@ -1,9 +1,10 @@
+import { Pagination } from '../classes/pagination';
 import { ModelConstructor, ModelConstructorFn } from '../types/model-constructor.type';
 
-export interface HasOneOptions {
+export interface HasOneOptions<P extends Pagination> {
 	externalName?: string;
 	includeInPayload?: boolean;
-	propertyClass: string | ModelConstructor<any> | ModelConstructorFn<any>;
+	propertyClass: string | ModelConstructor<any, P> | ModelConstructorFn<any, P>;
 }
 
 export const DEFAULT_HAS_ONE_OPTIONS = {
diff --git a/projects/ngx-hal/src/lib/interfaces/header-attribute-options.interface.ts b/projects/ngx-hal/src/lib/interfaces/header-attribute-options.interface.ts
index 9054eab..bd70443 100644
--- a/projects/ngx-hal/src/lib/interfaces/header-attribute-options.interface.ts
+++ b/projects/ngx-hal/src/lib/interfaces/header-attribute-options.interface.ts
@@ -1,7 +1,8 @@
+import { Pagination } from '../classes/pagination';
 import { ModelConstructor, ModelConstructorFn } from '../types/model-constructor.type';
 
-export interface HeaderAttributeOptions {
-	useClass?: boolean | ModelConstructor<any> | ModelConstructorFn<any>;
+export interface HeaderAttributeOptions<P extends Pagination> {
+	useClass?: boolean | ModelConstructor<any, P> | ModelConstructorFn<any, P>;
 	transformResponseValue?: (rawAttribute: any) => any;
 	transformBeforeSave?: (raw: any) => any;
 	externalName?: string;
diff --git a/projects/ngx-hal/src/lib/interfaces/model-options.interface.ts b/projects/ngx-hal/src/lib/interfaces/model-options.interface.ts
index 487a37c..d898035 100644
--- a/projects/ngx-hal/src/lib/interfaces/model-options.interface.ts
+++ b/projects/ngx-hal/src/lib/interfaces/model-options.interface.ts
@@ -1,15 +1,16 @@
 import { HalDocumentConstructor } from '../types/hal-document-construtor.type';
 import { HalModel } from '../models/hal.model';
 import { NetworkConfig } from './network-config.interface';
+import { Pagination } from '../classes/pagination';
 
-export class ModelOptions {
+export class ModelOptions<P extends Pagination> {
 	type: string;
 	endpoint?: string;
-	halDocumentClass?: HalDocumentConstructor<HalModel>;
+	halDocumentClass?: HalDocumentConstructor<HalModel<P>, P>;
 	networkConfig?: NetworkConfig;
 }
 
-export const DEFAULT_MODEL_OPTIONS: ModelOptions = {
+export const DEFAULT_MODEL_OPTIONS: ModelOptions<any> = {
 	type: '',
 };
 
diff --git a/projects/ngx-hal/src/lib/models/hal.model.ts b/projects/ngx-hal/src/lib/models/hal.model.ts
index 891a1bb..1c07b6f 100644
--- a/projects/ngx-hal/src/lib/models/hal.model.ts
+++ b/projects/ngx-hal/src/lib/models/hal.model.ts
@@ -50,9 +50,13 @@ import { isFunction } from '../helpers/is-function/is-function.helper';
 import { ModelEndpoints } from '../interfaces/model-endpoints.interface';
 import { map } from 'rxjs/operators';
 import { getArrayObjProperty, getObjProperty } from '../helpers/metadata/metadata.helper';
+import { Pagination } from '../classes/pagination';
 
-export abstract class HalModel<Datastore extends DatastoreService = DatastoreService> {
-	private config: ModelOptions = this['config'] || DEFAULT_MODEL_OPTIONS;
+export abstract class HalModel<
+	P extends Pagination,
+	Datastore extends DatastoreService<P> = DatastoreService<P>,
+> {
+	private config: ModelOptions<P> = this['config'] || DEFAULT_MODEL_OPTIONS;
 	private temporarySelfLink: string = null;
 	private localModelIdentificator: string;
 	private internalHasManyDocumentIdentificators: { [K: string]: string } = {};
@@ -104,7 +108,10 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 		return this.config.type;
 	}
 
-	public getHalDocumentClass<T extends this>(): HalDocumentConstructor<T> {
+	public getHalDocumentClass<T extends HalModel<P>, P extends Pagination>(): HalDocumentConstructor<
+		T,
+		P
+	> {
 		return getObjProperty(this, HAL_MODEL_DOCUMENT_CLASS_METADATA_KEY, null);
 	}
 
@@ -283,7 +290,7 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 		const externalPropertyName: string = property.externalName;
 
 		// TODO check if this[propertyName] is an array of models or just a HalDocument
-		this[propertyName].forEach((model: HalModel) => {
+		this[propertyName].forEach((model: HalModel<P>) => {
 			if (model && model.selfLink) {
 				hasManyPropertyLinks.push({
 					href: model.selfLink,
@@ -364,7 +371,7 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 		return this.datastore.fetchModelRelationships(this, relationshipDescriptors, requestOptions);
 	}
 
-	public getRelationship<T extends HalModel>(relationshipName: string): T | HalDocument<T> {
+	public getRelationship<T extends HalModel<P>>(relationshipName: string): T | HalDocument<T, P> {
 		const property: ModelProperty = this.getPropertyData(relationshipName);
 
 		const isHasOneProperty: boolean = property.type === ModelPropertyEnum.HasOne;
@@ -417,7 +424,7 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 				get() {
 					return this.getHasOneRelationship(property);
 				},
-				set<T extends HalModel>(value: T) {
+				set<T extends HalModel<P>>(value: T) {
 					if (isHalModelInstance(value) || !value) {
 						this.replaceRelationshipModel(property.externalName, value);
 					} else {
@@ -436,7 +443,7 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 			Object.defineProperty(this, property.name, {
 				configurable: true,
 				get() {
-					const halDocument: HalDocument<HalModel> = this.getHasManyRelationship(property);
+					const halDocument: HalDocument<HalModel<P>, P> = this.getHasManyRelationship(property);
 
 					if (!halDocument) {
 						return;
@@ -444,8 +451,10 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 
 					return halDocument.models;
 				},
-				set<T extends HalModel>(value: Array<T>) {
-					const existingHalDocument: HalDocument<HalModel> = this.getHasManyRelationship(property);
+				set<T extends HalModel<P>>(value: Array<T>) {
+					const existingHalDocument: HalDocument<HalModel<P>, P> = this.getHasManyRelationship(
+						property,
+					);
 
 					if (existingHalDocument) {
 						existingHalDocument.models = value;
@@ -505,7 +514,7 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 		);
 	}
 
-	private getHasOneRelationship<T extends HalModel>(property: ModelProperty): T {
+	private getHasOneRelationship<T extends HalModel<P>>(property: ModelProperty): T {
 		const relationshipLinks: RawHalLink = this.links[property.externalName];
 
 		if (!relationshipLinks) {
@@ -517,7 +526,9 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 		return this.datastore.storage.get(modelIdentificator);
 	}
 
-	private getHasManyRelationship<T extends HalModel>(property: ModelProperty): HalDocument<T> {
+	private getHasManyRelationship<T extends HalModel<P>>(
+		property: ModelProperty,
+	): HalDocument<T, P> {
 		const uniqueRelationshipIdentificator: string =
 			this.hasManyDocumentIdentificators[property.externalName];
 
@@ -525,9 +536,9 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 			return;
 		}
 
-		const halDocument: HalDocument<T> = this.datastore.storage.get(
+		const halDocument: HalDocument<T, P> = this.datastore.storage.get(
 			uniqueRelationshipIdentificator,
-		) as HalDocument<T>;
+		) as HalDocument<T, P>;
 
 		if (!halDocument) {
 			console.warn(`Has many relationship ${property.name} is not fetched.`);
@@ -551,7 +562,7 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 		this.temporarySelfLink = link;
 	}
 
-	private replaceRelationshipModel<T extends HalModel>(
+	private replaceRelationshipModel<T extends HalModel<P>>(
 		relationshipName: string,
 		relationshipModel: T,
 	): void {
@@ -579,15 +590,15 @@ export abstract class HalModel<Datastore extends DatastoreService = DatastoreSer
 		this.localModelIdentificator = `${LOCAL_MODEL_ID_PREFIX}-${generateUUID()}`;
 	}
 
-	private isHasOneProperty(property: ModelOptions): boolean {
+	private isHasOneProperty(property: ModelOptions<P>): boolean {
 		return property.type === ModelPropertyEnum.HasOne;
 	}
 
-	private isHasManyProperty(property: ModelOptions): boolean {
+	private isHasManyProperty(property: ModelOptions<P>): boolean {
 		return property.type === ModelPropertyEnum.HasMany;
 	}
 
-	public populateModelMetadata<K extends HalModel>(sourceModel: K) {
+	public populateModelMetadata<K extends HalModel<P>>(sourceModel: K) {
 		this.resource = sourceModel.resource;
 		this.rawResponse = sourceModel.rawResponse;
 		this.parseAttributes(this.resource);
diff --git a/projects/ngx-hal/src/lib/services/datastore/datastore.service.ts b/projects/ngx-hal/src/lib/services/datastore/datastore.service.ts
index b1e9e15..02d108e 100644
--- a/projects/ngx-hal/src/lib/services/datastore/datastore.service.ts
+++ b/projects/ngx-hal/src/lib/services/datastore/datastore.service.ts
@@ -15,7 +15,6 @@ import { RawHalResource } from '../../interfaces/raw-hal-resource.interface';
 import { ModelProperty, AttributeModelProperty } from '../../interfaces/model-property.interface';
 import { ModelProperty as ModelPropertyEnum } from '../../enums/model-property.enum';
 import { RawHalLink } from '../../interfaces/raw-hal-link.interface';
-import { PaginationConstructor } from '../../types/pagination.type';
 import { getResponseHeader } from '../../utils/get-response-headers/get-response-header.util';
 import { CacheStrategy } from '../../enums/cache-strategy.enum';
 import { createHalStorage } from '../../classes/hal-storage/hal-storage-factory';
@@ -39,25 +38,29 @@ import { isString } from '../../utils/is-string/is-string.util';
 import { isFunction } from '../../helpers/is-function/is-function.helper';
 import { populateTemplatedUrl } from '../../helpers/populate-templated-url/populate-templated-url.helper';
 import { getObjProperty } from '../../helpers/metadata/metadata.helper';
+import { Pagination } from '../../classes/pagination';
 
 @Injectable()
-export class DatastoreService {
+export class DatastoreService<P extends Pagination> {
 	public networkConfig: NetworkConfig = this['networkConfig'] || DEFAULT_NETWORK_CONFIG;
 	private _cacheStrategy: CacheStrategy;
 	// tslint:disable-next-line
-	private _storage: HalStorage; // set by Config decorator
+	private _storage: HalStorage<P>; // set by Config decorator
 	private internalStorage = createHalStorage(this.cacheStrategy, this.halStorage);
 	protected httpParamsOptions?: object;
-	public paginationClass: PaginationConstructor;
+	public paginationClass: { new (...args): P };
 	public modelTypes = [];
 
 	constructor(public http: HttpClient) {}
 
-	private getHalDocumentClass<T extends HalModel>(): HalDocumentConstructor<T> {
+	private getHalDocumentClass<
+		T extends HalModel<P>,
+		P extends Pagination,
+	>(): HalDocumentConstructor<T, P> {
 		return getObjProperty(this, HAL_DATASTORE_DOCUMENT_CLASS_METADATA_KEY, null) || HalDocument;
 	}
 
-	public buildUrl(model?: HalModel): string {
+	public buildUrl(model?: HalModel<P>): string {
 		const hostUrl: string = this.buildHostUrl(model);
 
 		const urlParts: Array<string> = [hostUrl, model ? model.endpoint : null];
@@ -69,22 +72,22 @@ export class DatastoreService {
 		return urlParts.filter((urlPart) => urlPart).join('/');
 	}
 
-	public createHalDocument<T extends HalModel>(
+	public createHalDocument<T extends HalModel<P>>(
 		rawResource: RawHalResource,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		rawResponse?: HttpResponse<any>,
-	): HalDocument<T> {
-		const propertyClass: ModelConstructor<T> = isFunction(modelClass)
-			? (modelClass as ModelConstructorFn<T>)(rawResource)
-			: (modelClass as ModelConstructor<T>);
+	): HalDocument<T, P> {
+		const propertyClass: ModelConstructor<T, P> = isFunction(modelClass)
+			? (modelClass as ModelConstructorFn<T, P>)(rawResource)
+			: (modelClass as ModelConstructor<T, P>);
 		const representantiveModel: T = new propertyClass({}, this);
 		const halDocumentClass =
-			representantiveModel.getHalDocumentClass() || this.getHalDocumentClass<T>();
+			representantiveModel.getHalDocumentClass<T, P>() || this.getHalDocumentClass<T, P>();
 		return new halDocumentClass(rawResource, rawResponse, propertyClass, this);
 	}
 
-	public findOne<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	public findOne<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		modelId: string,
 		includeRelationships: Array<string | RelationshipRequestDescriptor> = [],
 		requestOptions: RequestOptions = {},
@@ -110,7 +113,7 @@ export class DatastoreService {
 		);
 	}
 
-	public fetchModelRelationships<T extends HalModel>(
+	public fetchModelRelationships<T extends HalModel<P>>(
 		model: T,
 		relationshipNames: RelationshipRequestDescriptor | Array<RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions = {},
@@ -132,7 +135,7 @@ export class DatastoreService {
 		return combineLatest(relationships$).pipe(map(() => model));
 	}
 
-	private fetchRelationships<T extends HalModel>(
+	private fetchRelationships<T extends HalModel<P>>(
 		model: T,
 		relationshipDescriptors: Array<RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions = {}, // "global" options for all requests
@@ -162,7 +165,7 @@ export class DatastoreService {
 			// Checks if the relationship is already embdedded inside the emdedded property, or
 			// as a part of attribute properties
 			const embeddedRelationship: RawHalResource = model.getEmbeddedResource(relationshipName);
-			let fetchedModels: T | HalDocument<T>;
+			let fetchedModels: T | HalDocument<T, P>;
 
 			if (embeddedRelationship) {
 				fetchedModels = this.processRawResource(
@@ -261,69 +264,69 @@ export class DatastoreService {
 		);
 	}
 
-	private handleGetRequestWithRelationships<T extends HalModel>(
+	private handleGetRequestWithRelationships<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: true,
 		includeRelationships: Array<RelationshipRequestDescriptor>,
 	): Observable<T>;
-	private handleGetRequestWithRelationships<T extends HalModel>(
+	private handleGetRequestWithRelationships<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: false,
 		includeRelationships: Array<RelationshipRequestDescriptor>,
-	): Observable<HalDocument<T>>;
-	private handleGetRequestWithRelationships<T extends HalModel>(
+	): Observable<HalDocument<T, P>>;
+	private handleGetRequestWithRelationships<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		includeRelationships: Array<RelationshipRequestDescriptor>,
-	): Observable<T | HalDocument<T>>;
-	private handleGetRequestWithRelationships<T extends HalModel>(
+	): Observable<T | HalDocument<T, P>>;
+	private handleGetRequestWithRelationships<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: true,
 		includeRelationships: Array<RelationshipRequestDescriptor>,
-		fetchedModels: T | HalDocument<T>,
+		fetchedModels: T | HalDocument<T, P>,
 	): Observable<T>;
-	private handleGetRequestWithRelationships<T extends HalModel>(
+	private handleGetRequestWithRelationships<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		includeRelationships: Array<RelationshipRequestDescriptor>,
 		fetchedModels: T,
 	): Observable<T>;
-	private handleGetRequestWithRelationships<T extends HalModel>(
+	private handleGetRequestWithRelationships<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		includeRelationships: Array<RelationshipRequestDescriptor>,
-		fetchedModels: HalDocument<T>,
-	): Observable<HalDocument<T>>;
-	private handleGetRequestWithRelationships<T extends HalModel>(
+		fetchedModels: HalDocument<T, P>,
+	): Observable<HalDocument<T, P>>;
+	private handleGetRequestWithRelationships<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		includeRelationships: Array<RelationshipRequestDescriptor>,
-		fetchedModels: T | HalDocument<T>,
+		fetchedModels: T | HalDocument<T, P>,
 		storePartialModels?: boolean,
-	): Observable<T | HalDocument<T>>;
-	private handleGetRequestWithRelationships<T extends HalModel>(
+	): Observable<T | HalDocument<T, P>>;
+	private handleGetRequestWithRelationships<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		includeRelationships: Array<RelationshipRequestDescriptor> = [],
-		fetchedModels: T | HalDocument<T> = null,
+		fetchedModels: T | HalDocument<T, P> = null,
 		storePartialModels?: boolean,
-	): Observable<T | HalDocument<T>> {
+	): Observable<T | HalDocument<T, P>> {
 		let models$;
 
 		if (fetchedModels) {
@@ -340,10 +343,10 @@ export class DatastoreService {
 
 		if (includeRelationships.length) {
 			return models$.pipe(
-				flatMap((model: T | HalDocument<T>) => {
+				flatMap((model: T | HalDocument<T, P>) => {
 					const models: Array<T> = isSingleResource
 						? ([model] as Array<T>)
-						: (model as HalDocument<T>).models;
+						: (model as HalDocument<T, P>).models;
 
 					const relationshipCalls: Array<Observable<any>> = this.triggerFetchingModelRelationships(
 						models,
@@ -363,14 +366,14 @@ export class DatastoreService {
 		return models$;
 	}
 
-	private makeGetRequestWrapper<T extends HalModel>(
+	private makeGetRequestWrapper<T extends HalModel<P>>(
 		url: string,
 		requestsOptions: RequestsOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		storePartialModels?: boolean,
-	): Observable<HalDocument<T> | T> {
-		const originalGetRequest$: Observable<T | HalDocument<T>> = this.makeGetRequest(
+	): Observable<HalDocument<T, P> | T> {
+		const originalGetRequest$: Observable<T | HalDocument<T, P>> = this.makeGetRequest(
 			url,
 			requestsOptions.mainRequest,
 			modelClass,
@@ -400,7 +403,7 @@ export class DatastoreService {
 		return originalGetRequest$;
 	}
 
-	private triggerFetchingModelRelationships<T extends HalModel>(
+	private triggerFetchingModelRelationships<T extends HalModel<P>>(
 		models: Array<T>,
 		includeRelationships: Array<RelationshipRequestDescriptor>,
 		requestOptions?: RequestOptions,
@@ -419,75 +422,75 @@ export class DatastoreService {
 		return modelRelationshipCalls;
 	}
 
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 	): Observable<Array<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: false,
 	): Observable<Array<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: false,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
 	): Observable<Array<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: true,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
-	): Observable<HalDocument<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	): Observable<HalDocument<T, P>>;
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: true,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions,
-	): Observable<HalDocument<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	): Observable<HalDocument<T, P>>;
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: true,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions,
 		customUrl?: string,
-	): Observable<HalDocument<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	): Observable<HalDocument<T, P>>;
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: false,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions,
 	): Observable<Array<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: boolean,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions,
-	): Observable<Array<T> | HalDocument<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	): Observable<Array<T> | HalDocument<T, P>>;
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: boolean,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions,
 		customUrl: string,
-	): Observable<Array<T> | HalDocument<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	): Observable<Array<T> | HalDocument<T, P>>;
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: boolean,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions,
 		customUrl: string,
 		subsequentRequestsOptions: RequestOptions,
-	): Observable<Array<T> | HalDocument<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	): Observable<Array<T> | HalDocument<T, P>>;
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: true,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
@@ -495,9 +498,9 @@ export class DatastoreService {
 		customUrl: string,
 		subsequentRequestsOptions: RequestOptions,
 		storePartialModels?: boolean,
-	): Observable<HalDocument<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	): Observable<HalDocument<T, P>>;
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: false,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
@@ -506,8 +509,8 @@ export class DatastoreService {
 		subsequentRequestsOptions: RequestOptions,
 		storePartialModels?: boolean,
 	): Observable<T>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: boolean,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
@@ -515,9 +518,9 @@ export class DatastoreService {
 		customUrl: string,
 		subsequentRequestsOptions: RequestOptions,
 		storePartialModels?: boolean,
-	): Observable<Array<T> | HalDocument<T>>;
-	public find<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	): Observable<Array<T> | HalDocument<T, P>>;
+	public find<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		params: object | { [param: string]: string | string[] } | HttpParams = {},
 		includeMeta: boolean = false,
 		includeRelationships: Array<string | RelationshipRequestDescriptor> = [],
@@ -525,7 +528,7 @@ export class DatastoreService {
 		customUrl?: string,
 		subsequentRequestsOptions: RequestOptions = {},
 		storePartialModels: boolean = false,
-	): Observable<HalDocument<T> | Array<T>> {
+	): Observable<HalDocument<T, P> | Array<T>> {
 		const url: string = customUrl || this.buildModelUrl(modelClass);
 
 		const subsequentOptions: RequestOptions = deepmergeWrapper({}, subsequentRequestsOptions);
@@ -553,7 +556,7 @@ export class DatastoreService {
 			null,
 			storePartialModels,
 		).pipe(
-			flatMap((halDocument: HalDocument<T>) => {
+			flatMap((halDocument: HalDocument<T, P>) => {
 				if (relationshipDescriptors.length) {
 					return of(halDocument);
 				}
@@ -569,13 +572,13 @@ export class DatastoreService {
 					}),
 				);
 			}),
-			map((halDocument: HalDocument<T>) => (includeMeta ? halDocument : halDocument.models)),
+			map((halDocument: HalDocument<T, P>) => (includeMeta ? halDocument : halDocument.models)),
 		);
 	}
 
-	public save<T extends HalModel>(
+	public save<T extends HalModel<P>>(
 		model: T,
-		modelClass: ModelConstructor<T>,
+		modelClass: ModelConstructor<T, P>,
 		requestOptions?: RequestOptions,
 		saveOptions: CustomOptions<T> = {},
 	): Observable<T> {
@@ -630,7 +633,7 @@ export class DatastoreService {
 		);
 	}
 
-	private updateModelWithChangedProperties<T extends HalModel>(model: T, payload: object) {
+	private updateModelWithChangedProperties<T extends HalModel<P>>(model: T, payload: object) {
 		Object.keys(payload).forEach((externalPropertyName: string) => {
 			const property: AttributeModelProperty = model.getPropertyData(externalPropertyName);
 
@@ -644,7 +647,7 @@ export class DatastoreService {
 		});
 	}
 
-	public update<T extends HalModel>(
+	public update<T extends HalModel<P>>(
 		model: T,
 		requestOptions?: RequestOptions,
 		updateOptions: CustomOptions<T> = {},
@@ -677,7 +680,7 @@ export class DatastoreService {
 		);
 	}
 
-	public delete<T extends HalModel>(
+	public delete<T extends HalModel<P>>(
 		model: T,
 		requestOptions?: RequestOptions,
 		updateOptions: CustomOptions<T> = {},
@@ -700,59 +703,59 @@ export class DatastoreService {
 		return this.internalStorage;
 	}
 
-	public request<T extends HalModel>(
+	public request<T extends HalModel<P>>(
 		method: string,
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T>,
+		modelClass: ModelConstructor<T, P>,
 		singleResource: false,
-	): Observable<HalDocument<T>>;
-	public request<T extends HalModel>(
+	): Observable<HalDocument<T, P>>;
+	public request<T extends HalModel<P>>(
 		method: string,
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T>,
+		modelClass: ModelConstructor<T, P>,
 		singleResource: false,
 		includeNetworkConfig: false,
-	): Observable<HalDocument<T>>;
-	public request<T extends HalModel>(
+	): Observable<HalDocument<T, P>>;
+	public request<T extends HalModel<P>>(
 		method: string,
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T>,
+		modelClass: ModelConstructor<T, P>,
 		singleResource: false,
 		includeNetworkConfig: true,
-	): Observable<HalDocument<T>>;
-	public request<T extends HalModel>(
+	): Observable<HalDocument<T, P>>;
+	public request<T extends HalModel<P>>(
 		method: string,
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T>,
+		modelClass: ModelConstructor<T, P>,
 		singleResource: true,
 	): Observable<T>;
-	public request<T extends HalModel>(
+	public request<T extends HalModel<P>>(
 		method: string,
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T>,
+		modelClass: ModelConstructor<T, P>,
 		singleResource: boolean,
-	): Observable<HalDocument<T> | T>;
-	public request<T extends HalModel>(
+	): Observable<HalDocument<T, P> | T>;
+	public request<T extends HalModel<P>>(
 		method: string,
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T>,
+		modelClass: ModelConstructor<T, P>,
 		singleResource: boolean,
 		includeNetworkConfig?: boolean,
-	): Observable<HalDocument<T> | T>;
-	public request<T extends HalModel>(
+	): Observable<HalDocument<T, P> | T>;
+	public request<T extends HalModel<P>>(
 		method: string,
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T>,
+		modelClass: ModelConstructor<T, P>,
 		singleResource: boolean,
 		includeNetworkConfig: boolean = true,
-	): Observable<HalDocument<T> | T> {
+	): Observable<HalDocument<T, P> | T> {
 		const customUrl: string = includeNetworkConfig
 			? `${this.buildHostUrl(new modelClass({}, this))}/${url}`
 			: url;
@@ -765,32 +768,32 @@ export class DatastoreService {
 		}
 	}
 
-	private makeGetRequest<T extends HalModel>(
+	private makeGetRequest<T extends HalModel<P>>(
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		singleResource: false,
-	): Observable<HalDocument<T>>;
-	private makeGetRequest<T extends HalModel>(
+	): Observable<HalDocument<T, P>>;
+	private makeGetRequest<T extends HalModel<P>>(
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		singleResource: true,
 	): Observable<T>;
-	private makeGetRequest<T extends HalModel>(
+	private makeGetRequest<T extends HalModel<P>>(
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		singleResource: boolean,
 		storePartialModels?: boolean,
-	): Observable<HalDocument<T> | T>;
-	private makeGetRequest<T extends HalModel>(
+	): Observable<HalDocument<T, P> | T>;
+	private makeGetRequest<T extends HalModel<P>>(
 		url: string,
 		requestOptions: RequestOptions,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		singleResource: boolean,
 		storePartialModels?: boolean,
-	): Observable<HalDocument<T> | T> {
+	): Observable<HalDocument<T, P> | T> {
 		const {
 			cleanUrl,
 			requestOptions: options,
@@ -823,7 +826,7 @@ export class DatastoreService {
 		);
 	}
 
-	public head<T extends HalModel>(url: string, requestOptions: RequestOptions): Observable<any> {
+	public head<T extends HalModel<P>>(url: string, requestOptions: RequestOptions): Observable<any> {
 		const { cleanUrl, requestOptions: options } = this.extractRequestInfo(url, requestOptions);
 
 		return this.http.head<T>(cleanUrl, options as any);
@@ -880,7 +883,7 @@ export class DatastoreService {
 		return params;
 	}
 
-	private makePostRequest<T extends HalModel>(
+	private makePostRequest<T extends HalModel<P>>(
 		url: string,
 		payload: object,
 		requestOptions?: RequestOptions,
@@ -892,7 +895,7 @@ export class DatastoreService {
 		return this.http.post<T>(cleanUrl, payload, options as { [K: string]: any });
 	}
 
-	private makePutRequest<T extends HalModel>(
+	private makePutRequest<T extends HalModel<P>>(
 		url: string,
 		payload: object,
 		requestOptions?: RequestOptions,
@@ -904,7 +907,7 @@ export class DatastoreService {
 		return this.http.put<T>(cleanUrl, payload, options as { [K: string]: any });
 	}
 
-	private makePatchRequest<T extends HalModel>(
+	private makePatchRequest<T extends HalModel<P>>(
 		url: string,
 		payload: object,
 		requestOptions?: RequestOptions,
@@ -916,7 +919,7 @@ export class DatastoreService {
 		return this.http.patch<T>(cleanUrl, payload, options as { [K: string]: any });
 	}
 
-	private makeDeleteRequest<T extends HalModel>(
+	private makeDeleteRequest<T extends HalModel<P>>(
 		url: string,
 		requestOptions?: RequestOptions,
 	): Observable<any> {
@@ -927,51 +930,55 @@ export class DatastoreService {
 		return this.http.delete<T>(cleanUrl, options as { [K: string]: any });
 	}
 
-	private processRawResource<T extends HalModel>(
+	private processRawResource<T extends HalModel<P>>(
 		rawResource: RawHalResource,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: false,
 		response: HttpResponse<T>,
-	): HalDocument<T>;
-	private processRawResource<T extends HalModel>(
+	): HalDocument<T, P>;
+	private processRawResource<T extends HalModel<P>>(
 		rawResource: RawHalResource,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: true,
 		response: HttpResponse<T>,
 	): T;
-	private processRawResource<T extends HalModel>(
+	private processRawResource<T extends HalModel<P>>(
 		rawResource: RawHalResource,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		response: HttpResponse<T>,
-	): T | HalDocument<T>;
-	private processRawResource<T extends HalModel>(
+	): T | HalDocument<T, P>;
+	private processRawResource<T extends HalModel<P>>(
 		rawResource: RawHalResource,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		response: HttpResponse<T>,
 		url?: string,
 		savePartialModels?: boolean,
-	): T | HalDocument<T>;
-	private processRawResource<T extends HalModel>(
+	): T | HalDocument<T, P>;
+	private processRawResource<T extends HalModel<P>>(
 		rawResource: RawHalResource,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		isSingleResource: boolean,
 		response: HttpResponse<T>,
 		url?: string,
 		savePartialModels?: boolean,
-	): T | HalDocument<T> {
+	): T | HalDocument<T, P> {
 		if (isSingleResource) {
-			const propertyClass: ModelConstructor<T> = isFunction(modelClass)
-				? (modelClass as ModelConstructorFn<T>)(rawResource)
-				: (modelClass as ModelConstructor<T>);
+			const propertyClass: ModelConstructor<T, P> = isFunction(modelClass)
+				? (modelClass as ModelConstructorFn<T, P>)(rawResource)
+				: (modelClass as ModelConstructor<T, P>);
 			const model: T = new propertyClass(rawResource, this, response);
 			this.populateResourceWithRelationshipIndentificators(model);
 			this.storage.save(model, response, [url]);
 			return model;
 		}
 
-		const halDocument: HalDocument<T> = this.createHalDocument(rawResource, modelClass, response);
+		const halDocument: HalDocument<T, P> = this.createHalDocument(
+			rawResource,
+			modelClass,
+			response,
+		);
 
 		this.storage.saveAll(halDocument.models, savePartialModels);
 
@@ -983,7 +990,7 @@ export class DatastoreService {
 		return halDocument;
 	}
 
-	private buildModelUrl(modelClass: ModelConstructor<HalModel>, modelId?: string): string {
+	private buildModelUrl(modelClass: ModelConstructor<HalModel<P>, P>, modelId?: string): string {
 		const model = new modelClass({}, this);
 
 		if (modelId && model.modelEndpoints?.singleResourceEndpoint) {
@@ -1000,16 +1007,16 @@ export class DatastoreService {
 		return response.body;
 	}
 
-	private populateResourceWithRelationshipIndentificators<T extends HalModel>(model: T): void {
+	private populateResourceWithRelationshipIndentificators<T extends HalModel<P>>(model: T): void {
 		const localResource: T = this.storage.get(model.uniqueModelIdentificator);
 		if (localResource) {
 			model.hasManyDocumentIdentificators = localResource.hasManyDocumentIdentificators;
 		}
 	}
 
-	private fetchEmbeddedListItems<T extends HalModel>(
-		halDocument: HalDocument<T>,
-		modelClass: ModelConstructor<T> | ModelConstructorFn<T>,
+	private fetchEmbeddedListItems<T extends HalModel<P>>(
+		halDocument: HalDocument<T, P>,
+		modelClass: ModelConstructor<T, P> | ModelConstructorFn<T, P>,
 		includeRelationships: Array<RelationshipRequestDescriptor> = [],
 		requestOptions: RequestOptions = {},
 	): Observable<Array<T>> {
@@ -1057,13 +1064,11 @@ export class DatastoreService {
 		return combineLatest(modelCalls);
 	}
 
-	private buildHostUrl(model?: HalModel): string {
-		// tslint:disable-next-line:max-line-length
+	private buildHostUrl(model?: HalModel<P>): string {
 		const baseUrl: string =
 			model && model.networkConfig && model.networkConfig.baseUrl
 				? model.networkConfig.baseUrl
 				: this.networkConfig.baseUrl;
-		// tslint:disable-next-line:max-line-length
 		const networkEndpoint: string =
 			model && model.networkConfig && model.networkConfig.endpoint
 				? model.networkConfig.endpoint
@@ -1072,7 +1077,7 @@ export class DatastoreService {
 		return [baseUrl, networkEndpoint].filter((urlPart) => urlPart).join('/');
 	}
 
-	private defaultUrlBuildFunction<T extends HalModel>(model: T, urlFromModel: string): string {
+	private defaultUrlBuildFunction<T extends HalModel<P>>(model: T, urlFromModel: string): string {
 		if (model.isSaved && model.selfLink) {
 			return model.selfLink;
 		}
@@ -1094,12 +1099,12 @@ export class DatastoreService {
 		return this._cacheStrategy;
 	}
 
-	private get halStorage(): HalStorage {
+	private get halStorage(): HalStorage<P> {
 		return this._storage;
 	}
 
-	public findModelClassByType<T extends HalModel>(modelType: string): ModelConstructor<T> {
-		const modelClass: ModelConstructor<T> = this.modelTypes.find(
+	public findModelClassByType<T extends HalModel<P>>(modelType: string): ModelConstructor<T, P> {
+		const modelClass: ModelConstructor<T, P> = this.modelTypes.find(
 			(modelClass) => modelClass.modelType === modelType,
 		);
 
@@ -1112,8 +1117,8 @@ export class DatastoreService {
 		return modelClass;
 	}
 
-	public createModel<T extends HalModel>(
-		modelClass: ModelConstructor<T>,
+	public createModel<T extends HalModel<P>>(
+		modelClass: ModelConstructor<T, P>,
 		recordData: object = {},
 	): T {
 		const rawRecordData: object = Object.assign({}, recordData);
diff --git a/projects/ngx-hal/src/lib/services/model-service/model.service.ts b/projects/ngx-hal/src/lib/services/model-service/model.service.ts
index a7c18db..d18b0c5 100644
--- a/projects/ngx-hal/src/lib/services/model-service/model.service.ts
+++ b/projects/ngx-hal/src/lib/services/model-service/model.service.ts
@@ -6,9 +6,13 @@ import { RequestOptions } from '../../types/request-options.type';
 import { HalDocument } from '../../classes/hal-document';
 import { ModelConstructor } from '../../types/model-constructor.type';
 import { RelationshipRequestDescriptor } from '../../types/relationship-request-descriptor.type';
+import { Pagination } from '../../classes/pagination';
 
-export abstract class ModelService<Model extends HalModel> {
-	constructor(protected datastore: DatastoreService, private modelClass: ModelConstructor<Model>) {}
+export abstract class ModelService<Model extends HalModel<P>, P extends Pagination> {
+	constructor(
+		protected datastore: DatastoreService<P>,
+		private modelClass: ModelConstructor<Model, P>,
+	) {}
 
 	public findOne(
 		modelId: string,
@@ -37,7 +41,7 @@ export abstract class ModelService<Model extends HalModel> {
 	public find(
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: true,
-	): Observable<HalDocument<Model>>;
+	): Observable<HalDocument<Model, P>>;
 	public find(
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: false,
@@ -47,7 +51,7 @@ export abstract class ModelService<Model extends HalModel> {
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: true,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
-	): Observable<HalDocument<Model>>;
+	): Observable<HalDocument<Model, P>>;
 	public find(
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: false,
@@ -59,7 +63,7 @@ export abstract class ModelService<Model extends HalModel> {
 		includeMeta: true,
 		includeRelationships: Array<string | RelationshipRequestDescriptor>,
 		requestOptions: RequestOptions,
-	): Observable<HalDocument<Model>>;
+	): Observable<HalDocument<Model, P>>;
 	public find(
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: true,
@@ -68,7 +72,7 @@ export abstract class ModelService<Model extends HalModel> {
 		subsequentRequestsOptions: RequestOptions,
 		customUrl?: string,
 		storePartialModels?: boolean,
-	): Observable<HalDocument<Model>>;
+	): Observable<HalDocument<Model, P>>;
 	public find(
 		params: object | { [param: string]: string | string[] } | HttpParams,
 		includeMeta: false,
@@ -86,7 +90,7 @@ export abstract class ModelService<Model extends HalModel> {
 		subsequentRequestsOptions: RequestOptions = {},
 		customUrl?: string,
 		storePartialModels?: boolean,
-	): Observable<HalDocument<Model> | Array<Model>> {
+	): Observable<HalDocument<Model, P> | Array<Model>> {
 		return this.datastore.find(
 			this.modelClass,
 			params,
diff --git a/projects/ngx-hal/src/lib/types/hal-document-construtor.type.ts b/projects/ngx-hal/src/lib/types/hal-document-construtor.type.ts
index d9b88c3..92b6bea 100644
--- a/projects/ngx-hal/src/lib/types/hal-document-construtor.type.ts
+++ b/projects/ngx-hal/src/lib/types/hal-document-construtor.type.ts
@@ -1,6 +1,7 @@
 import { HalModel } from '../models/hal.model';
 import { HalDocument } from '../classes/hal-document';
+import { Pagination } from '../classes/pagination';
 
-export type HalDocumentConstructor<T extends HalModel> = {
-	new (...args): HalDocument<T>;
+export type HalDocumentConstructor<T extends HalModel<P>, P extends Pagination> = {
+	new (...args): HalDocument<T, P>;
 };
diff --git a/projects/ngx-hal/src/lib/types/model-constructor.type.ts b/projects/ngx-hal/src/lib/types/model-constructor.type.ts
index b1c0c6b..0f1f6c6 100644
--- a/projects/ngx-hal/src/lib/types/model-constructor.type.ts
+++ b/projects/ngx-hal/src/lib/types/model-constructor.type.ts
@@ -1,4 +1,7 @@
+import { Pagination } from '../classes/pagination';
 import { HalModel } from '../models/hal.model';
 
-export type ModelConstructor<T extends HalModel> = { new (...args): T };
-export type ModelConstructorFn<T extends HalModel> = (rawPropertyValue: any) => ModelConstructor<T>;
+export type ModelConstructor<T extends HalModel<P>, P extends Pagination> = { new (...args): T };
+export type ModelConstructorFn<T extends HalModel<P>, P extends Pagination> = (
+	rawPropertyValue: any,
+) => ModelConstructor<T, P>;
diff --git a/projects/ngx-hal/src/lib/types/pagination.type.ts b/projects/ngx-hal/src/lib/types/pagination.type.ts
deleted file mode 100644
index ef8d5d8..0000000
--- a/projects/ngx-hal/src/lib/types/pagination.type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Pagination } from '../classes/pagination';
-
-export type PaginationConstructor = { new (...args): Pagination };