@progress/sitefinity-webservices-sdk 0.3.1 → 1.0.3

package/dist/sitefinity-webservices-sdk.js

@@ -7,447 +7,36 @@
 		exports["Sitefinity"] = factory();
 	else
 		root["Sitefinity"] = factory();
-})(window, function() {
-return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = "./src/main.ts");
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ "./node_modules/tslib/tslib.es6.js":
-/*!*****************************************!*\
-  !*** ./node_modules/tslib/tslib.es6.js ***!
-  \*****************************************/
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __createBinding, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault, __classPrivateFieldGet, __classPrivateFieldSet */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__extends", function() { return __extends; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__assign", function() { return __assign; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__rest", function() { return __rest; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__decorate", function() { return __decorate; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__param", function() { return __param; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__metadata", function() { return __metadata; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__awaiter", function() { return __awaiter; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__generator", function() { return __generator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__createBinding", function() { return __createBinding; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__exportStar", function() { return __exportStar; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncValues", function() { return __asyncValues; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__makeTemplateObject", function() { return __makeTemplateObject; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importStar", function() { return __importStar; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importDefault", function() { return __importDefault; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__classPrivateFieldGet", function() { return __classPrivateFieldGet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__classPrivateFieldSet", function() { return __classPrivateFieldSet; });
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    }
-    return __assign.apply(this, arguments);
-}
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-}
-
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
-function __param(paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-}
-
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __generator(thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-}
-
-function __createBinding(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}
-
-function __exportStar(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-
-function __values(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-
-function __read(o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-}
-
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
-}
-
-function __spreadArrays() {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-};
-
-function __await(v) {
-    return this instanceof __await ? (this.v = v, this) : new __await(v);
-}
-
-function __asyncGenerator(thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-}
-
-function __asyncDelegator(o) {
-    var i, p;
-    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
-}
-
-function __asyncValues(o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
-
-function __makeTemplateObject(cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-
-function __importStar(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result.default = mod;
-    return result;
-}
-
-function __importDefault(mod) {
-    return (mod && mod.__esModule) ? mod : { default: mod };
-}
-
-function __classPrivateFieldGet(receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return privateMap.get(receiver);
-}
-
-function __classPrivateFieldSet(receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to set private field on non-instance");
-    }
-    privateMap.set(receiver, value);
-    return value;
-}
+})(self, function() {
+return /******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	var __webpack_modules__ = ({
 
+/***/ "./sitefinity-webservices-sdk.ts":
+/*!***************************************!*\
+  !*** ./sitefinity-webservices-sdk.ts ***!
+  \***************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-/***/ }),
-
-/***/ "./src/Authentication.ts":
-/*!*******************************!*\
-  !*** ./src/Authentication.ts ***!
-  \*******************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
 
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
-* @class Authentication
-* @classdesc The constructor of the Authentication object. This object is used for authenticating a user to Sitefinity.
-* @param {object} options - An object containing configuration options for the {@Link Authentication} object.
-* @param {string} options.serviceUrl - Your service url that points to the configured instance of Sitefinity service.
-*/
-var Authentication = /** @class */ (function () {
-    function Authentication(options) {
-        this._token = null;
-        this._serviceUrl = options.serviceUrl;
-        this.factory = options.factory;
-    }
-    /**
-    * Logins the user. A service call is made to login the user. If the call is successful and the service returns a token, this token is cached in the {@link Authentication} object.
-    * @memberOf Authentication
-    * @instance
-    * @param {string} username - The username.
-    * @param {string} password - The password.
-    * @param {Function} [success] - The success handler of the method.
-    * @param {Function} [failure] - The error handler of the method.
-    * @deprecated This method is deprecated and should not be used with versions of sitefinity >= 10.0
-    * @example
-    * sf.authentication.login("username", "password", successCb, failureCb);
-    */
-    Authentication.prototype.login = function (username, password, success, failure) {
-        var that = this;
-        var request = this.factory.create({
-            data: {
-                username: username,
-                password: password
-            },
-            urlOptions: {
-                baseUrl: that._serviceUrl + 'login'
-            },
-            successCb: function (data) {
-                that.setToken(data.value);
-                if (typeof success === 'function')
-                    success(data.value);
-            },
-            failureCb: failure
-        });
-        request._execute();
-    };
-    /**
-    * Logouts the user.
-    * @memberOf Authentication
-    * @instance
-    * @param {Function} [success] - The success handler of the method.
-    * @param {Function} [failure] - The error handler of the method.
-    * @deprecated This method is deprecated and should not be used with versions of sitefinity >= 10.0
-    */
-    Authentication.prototype.logout = function (success, failure) {
-        var that = this;
-        var request = this.factory.create({
-            urlOptions: {
-                baseUrl: that._serviceUrl + 'logout',
-                token: that.getToken()
-            },
-            successCb: function (data) {
-                that.setToken(null);
-                if (typeof success === 'function')
-                    success(data);
-            },
-            failureCb: failure
-        });
-        request._execute();
-    };
-    /**
-    * Sets the authentication token.
-    * @memberOf Authentication
-    * @instance
-    * @param {string} token - The token, which will be used for authentication.
-    */
-    Authentication.prototype.setToken = function (token) {
-        this._token = token;
-    };
-    /**
-    * Gets the authentication token.
-    * @memberOf Authentication
-    * @instance
-    * @returns {string}
-    */
-    Authentication.prototype.getToken = function () {
-        return this._token;
-    };
-    return Authentication;
-}());
-exports.Authentication = Authentication;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.js");
+tslib_1.__exportStar(__webpack_require__(/*! ./src/BlobBuilder */ "./src/BlobBuilder.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/constants */ "./src/constants.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/utils */ "./src/utils.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/WhereQuery */ "./src/WhereQuery.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Sitefinity */ "./src/Sitefinity.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/QueryBuilder */ "./src/QueryBuilder.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/QueryBase */ "./src/QueryBase.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Query */ "./src/Query.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/OrderProperty */ "./src/OrderProperty.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Expression */ "./src/Expression.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Data */ "./src/Data.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Requests/BatchRequest */ "./src/Requests/BatchRequest.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Requests/ExecutableRequest */ "./src/Requests/ExecutableRequest.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Requests/Request */ "./src/Requests/Request.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Requests/RequestBase */ "./src/Requests/RequestBase.ts"), exports);
+tslib_1.__exportStar(__webpack_require__(/*! ./src/Requests/RequestFactory */ "./src/Requests/RequestFactory.ts"), exports);
 
 
 /***/ }),
@@ -456,125 +45,78 @@ exports.Authentication = Authentication;
 /*!****************************!*\
   !*** ./src/BlobBuilder.ts ***!
   \****************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.BlobBuilder = void 0;
 /**
- * @classdesc The BlobBuilder class is used to generate blob objects.
- * @class BlobBuilder
+ * The BlobBuilder class is used to generate blob objects.
  */
 var BlobBuilder = /** @class */ (function () {
     function BlobBuilder() {
-        this._blob = new Blob();
+        this.blob = new Blob();
     }
     /**
-    * Append new value to blob.
-    * @memberOf BlobBuilder
-    * @instance
-    * @param {object} value - The value to be appended.
+    * Appends new value to blob.
     */
     BlobBuilder.prototype.append = function (value) {
-        this._blob = new Blob([this._blob, value]);
+        this.blob = new Blob([this.blob, value]);
     };
     /**
-    * Get generated blob.
-    * @memberOf BlobBuilder
+    * Gets generated blob.
     */
     BlobBuilder.prototype.build = function () {
-        return this._blob;
+        return this.blob;
     };
     return BlobBuilder;
 }());
 exports.BlobBuilder = BlobBuilder;
 
 
-/***/ }),
-
-/***/ "./src/ContentTypes.ts":
-/*!*****************************!*\
-  !*** ./src/ContentTypes.ts ***!
-  \*****************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var contentTypes = {
-    json: "application/json"
-};
-exports.default = contentTypes;
-
-
 /***/ }),
 
 /***/ "./src/Data.ts":
 /*!*********************!*\
   !*** ./src/Data.ts ***!
   \*********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Data = void 0;
+var constants_1 = __webpack_require__(/*! ./constants */ "./src/constants.ts");
 /**
-* @class Data
-* @classdesc The constructor of the Data object. This object is used for requesting data from Sitefinity.
-* @param {object} urlOptions - An object containing configuration options for the {@link Data} object.
-* @param {string} urlOptions.baseUrl - Your service url that points to the configured instance of Sitefinity service.
-* @param {string} urlOptions.entitySet - The url name of the type.
-* @param {object} urlOptions.SFParams - An object containing configuration options for requests.
-* @param {string} urlOptions.SFParams.provider - The provider name to use in each request.
-* @param {string} urlOptions.SFParams.culture - The culture name to use in each request.
+* The constructor of the Data object. This object is used for requesting data from Sitefinity.
 */
 var Data = /** @class */ (function () {
     function Data(urlOptions, factory) {
         this.urlOptions = urlOptions;
         this.factory = factory;
     }
-    // TODO: rethink this
     /**
     * Executes a GET request to retrieve a collection of items.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.action - The OData action along with its parameters.
-    * @param {object} parameters.query - The {@link WhereQuery} with which to filter the items.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.get = function (parameters) {
-        parameters = parameters || {};
-        // TODO: move to Request
-        if (parameters.query)
-            this.urlOptions.ODataParams = parameters.query;
         var request = this.factory.get({
             urlOptions: this.urlOptions,
+            query: parameters.query,
             action: parameters.action,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb,
             fallbackProperties: parameters.fallbackProperties
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a GET request to retrieve an/all item(s) operations.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.getOperations = function (parameters) {
         var request;
         var action = "operations";
         // Set parentId if no item key is passed
         if (!parameters.key)
-            action += "?parentId=" + parameters.parentId;
+            action += "?".concat(constants_1.SF_PARAMS.parentId, "=") + parameters.parentId;
         var params = {
             urlOptions: this.urlOptions,
             action: action,
@@ -588,79 +130,52 @@ var Data = /** @class */ (function () {
         else {
             request = this.factory.get(params);
         }
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a GET request for a single item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {object} parameters.query - The {@link QueryBase} object containing the OData query options that should be sent to the server.
-    * @param {string} parameters.key - The identifier of the item to be retrieved.
-    * @param {string} parameters.action - The OData action along with its parameters.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.getSingle = function (parameters) {
         if (!(parameters.key))
             throw "Parameter 'key' is required!";
-        if (parameters.query)
-            this.urlOptions.ODataParams = parameters.query;
         var request = this.factory.getSingle({
             urlOptions: this.urlOptions,
             key: parameters.key,
+            query: parameters.query,
             action: parameters.action,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb,
             fallbackProperties: parameters.fallbackProperties
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a POST request for a single item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {object} parameters.data - The payload of the request.
-    * @param {string} parameters.action - The OData action along with its parameters.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.create = function (parameters) {
         if (!(parameters.data))
             throw "Parameter 'data' is required!";
-        if (parameters.query)
-            this.urlOptions.ODataParams = parameters.query;
         var request = this.factory.create({
             urlOptions: this.urlOptions,
             key: parameters.key,
+            query: parameters.query,
             data: parameters.data,
             action: parameters.action,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a PATCH request to update a single item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {bool} parameters.saveTemp - A flag indicating whether to save in temp.
-    * @param {string} parameters.key - The identifier of the item to be updated.
-    * @param {object} parameters.data - The payload of the request.
-    * @param {string} parameters.action - The OData action along with its parameters.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     * @example
-    * var data = sf.data({
-    *     urlName: "newsitems",
-    *     providerName: "OpenAccessDataProvider",
-    *     cultureName: "en"
+    * const data = sf.data({
+    *     entitySet: "newsitems",
+    *     provider: "OpenAccessDataProvider",
+    *     culture: "en"
     * });
     *
-    * var newsItemUpdate =  {
+    * const newsItemUpdate =  {
     *    "Title": 'updated news title'
     * };
     *
@@ -684,16 +199,10 @@ var Data = /** @class */ (function () {
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a DELETE request to delete a single item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item to be deleted.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.destroy = function (parameters) {
         if (!(parameters.key))
@@ -704,17 +213,10 @@ var Data = /** @class */ (function () {
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a POST request to execute a workflow operation for single item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {object} parameters.data - The payload of the request.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.operation = function (parameters) {
         if (!(parameters.key || parameters.data))
@@ -727,17 +229,10 @@ var Data = /** @class */ (function () {
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a GET request to get the property of a single item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.property - The name of the property to be retrieved.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.getProperty = function (parameters) {
         if (!(parameters.key || parameters.property))
@@ -745,148 +240,99 @@ var Data = /** @class */ (function () {
         var request = this.factory.getProperty({
             urlOptions: this.urlOptions,
             key: parameters.key,
-            navigationProperty: parameters.property,
+            property: parameters.property,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a GET request to get the related property value of a single item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property to be retrieved.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.getRelated = function (parameters) {
-        if (!(parameters.key || parameters.navigationProperty))
-            throw "Parameters: 'data' and 'navigationProperty' are required!";
+        if (!(parameters.key || parameters.property))
+            throw "Parameters: 'data' and 'property' are required!";
         var request = this.factory.getRelated({
             urlOptions: this.urlOptions,
             key: parameters.key,
-            navigationProperty: parameters.navigationProperty,
+            property: parameters.property,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a GET request to retrieve the related property value of a single item by the id of the related item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property to be retrieved.
-    * @param {string} parameters.relatedKey - The identifier of the related item.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.getRelatedById = function (parameters) {
-        if (!(parameters.key || parameters.navigationProperty || parameters.relatedKey))
-            throw "Parameters: 'data', 'relatedKey' and 'navigationProperty' are required!";
+        if (!(parameters.key || parameters.property || parameters.relatedId))
+            throw "Parameters: 'data', 'relatedId' and 'property' are required!";
         var request = this.factory.getRelatedById({
             urlOptions: this.urlOptions,
             key: parameters.key,
-            relatedKey: parameters.relatedKey,
-            navigationProperty: parameters.navigationProperty,
+            relatedId: parameters.relatedId,
+            property: parameters.property,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a DELETE request to retrieve the delete all of the associated members in the relation property.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.destroyRelated = function (parameters) {
-        if (!(parameters.key || parameters.navigationProperty))
-            throw "Parameters: 'data' and 'navigationProperty' are required!";
+        if (!(parameters.key || parameters.property))
+            throw "Parameters: 'data' and 'property' are required!";
         var request = this.factory.destroyRelated({
             urlOptions: this.urlOptions,
             key: parameters.key,
-            navigationProperty: parameters.navigationProperty,
+            property: parameters.property,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a DELETE request to retrieve the a single entry of the associated members in the relation property.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property.
-    * @param {string} parameters.relatedKey - The identifier of the related item.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.destroyRelatedById = function (parameters) {
-        if (!(parameters.key || parameters.navigationProperty || parameters.relatedKey))
-            throw "Parameters: 'data', 'relatedKey' and 'navigationProperty' are required!";
+        if (!(parameters.key || parameters.property || parameters.relatedId))
+            throw "Parameters: 'data', 'relatedId' and 'property' are required!";
         var request = this.factory.destroyRelatedById({
             urlOptions: this.urlOptions,
             key: parameters.key,
-            relatedKey: parameters.relatedKey,
-            navigationProperty: parameters.navigationProperty,
+            relatedId: parameters.relatedId,
+            property: parameters.property,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a POST request to add a related item to the property collection.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property.
-    * @param {string} parameters.link - The URL of the related item.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     */
     Data.prototype.createRelated = function (parameters) {
-        if (!(parameters.key || parameters.navigationProperty || parameters.link))
-            throw "Parameters: 'data', 'link' and 'navigationProperty' are required!";
+        if (!(parameters.key || parameters.property || parameters.link))
+            throw "Parameters: 'data', 'link' and 'property' are required!";
         var data = {
             "@odata.id": parameters.link
         };
         var request = this.factory.createRelated({
             urlOptions: this.urlOptions,
             key: parameters.key,
-            navigationProperty: parameters.navigationProperty,
+            property: parameters.property,
             data: data,
             successCb: parameters.successCb,
             failureCb: parameters.failureCb
         });
-        request._execute();
+        request.execute();
     };
     /**
     * Executes a POST request to upload a media item.
-    * @memberOf Data
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.data - The data to be uploaded.
-    * @param {string} parameters.data.content - The base64 representation of the media item.
-    * @param {string} parameters.data.contentType - The content type of the item. E.g. image/jpeg.
-    * @param {string} parameters.data.name - The name of the media item.
-    * @param {string} parameters.data.payload - Holds the JSON metadata about the image. E.g. Title, Urlname etc.
-    * @param {string} parameters.data.uploadProperties - The properties passed on upload. Must contain ParentId and can contain FolderId, Title, UrlName, etc.
-    * @param {Function} parameters.successCb - The success callback function.
-    * @param {Function} parameters.failureCb - The error callback function.
     * @example
     *
-    * var data = sf.data({
-    *     urlName: "images"
+    * const data = sf.data({
+    *     entitySet: "images"
     * });
     * data.upload({
     *     data: {
@@ -895,7 +341,7 @@ var Data = /** @class */ (function () {
     *         name: "test.jpg",
     *         payload: {
     *             Title: "Test",
-    *             UrlName: "test"
+    *             entitySet: "test"
     *         },
     *         uploadProperties: {
     *             ParentId: "4BA7AD46-F29B-4E65-BE17-9BF7CE5BA1FB"
@@ -939,8 +385,7 @@ var Data = /** @class */ (function () {
             });
         }
         batch.endTransaction(transaction);
-        var executor = this.factory.createExecutor(batch);
-        executor._execute();
+        batch.execute();
     };
     return Data;
 }());
@@ -953,12 +398,11 @@ exports.Data = Data;
 /*!***************************!*\
   !*** ./src/Expression.ts ***!
   \***************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ComplexExpression = exports.BinaryExpression = exports.ExpressionBase = void 0;
 var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.js");
 var ExpressionBase = /** @class */ (function () {
     function ExpressionBase(type) {
@@ -1007,65 +451,17 @@ var ComplexExpression = /** @class */ (function (_super) {
 exports.ComplexExpression = ComplexExpression;
 
 
-/***/ }),
-
-/***/ "./src/Headers.ts":
-/*!************************!*\
-  !*** ./src/Headers.ts ***!
-  \************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.headerNames = {
-    contentType: "Content-Type",
-    authorization: "Authorization",
-    contentEncoding: "Content-Encoding",
-    operation: "X-Operation",
-    properties: "X-Sf-Properties",
-    fileName: "X-File-Name",
-    serviceRequest: "X-SF-Service-Request",
-    choicesBinaryRepresentation: "X-SF-Binary-Choice-Representation",
-    integrationMode: "X-SF-Integration-Mode"
-};
-
-
-/***/ }),
-
-/***/ "./src/HttpMethods.ts":
-/*!****************************!*\
-  !*** ./src/HttpMethods.ts ***!
-  \****************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var methods = {
-    Get: "GET",
-    Put: "PUT",
-    Post: "POST",
-    Patch: "PATCH",
-    Delete: "DELETE"
-};
-exports.default = methods;
-
-
 /***/ }),
 
 /***/ "./src/OrderProperty.ts":
 /*!******************************!*\
   !*** ./src/OrderProperty.ts ***!
   \******************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.OrderProperty = void 0;
 var utils_1 = __webpack_require__(/*! ./utils */ "./src/utils.ts");
 var OrderProperty = /** @class */ (function () {
     function OrderProperty(propertyPath, isDesc) {
@@ -1111,130 +507,109 @@ exports.OrderProperty = OrderProperty;
 /*!**********************!*\
   !*** ./src/Query.ts ***!
   \**********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Query = void 0;
 var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.js");
 var QueryBase_1 = __webpack_require__(/*! ./QueryBase */ "./src/QueryBase.ts");
 var WhereQuery_1 = __webpack_require__(/*! ./WhereQuery */ "./src/WhereQuery.ts");
 var OrderProperty_1 = __webpack_require__(/*! ./OrderProperty */ "./src/OrderProperty.ts");
 var QueryBuilder_1 = __webpack_require__(/*! ./QueryBuilder */ "./src/QueryBuilder.ts");
 /**
- * @classdesc The query class is used for constructing queries.
- * @class Query
- * @augments QueryBase
+ * The query class is used for constructing queries.
  * @example
- * var query = new Sitefinity.Query();
- * var query0 = query.where().and().endsWith("Title", "Record").done().or().startsWith('Title', 'asd').done().done();
- * var query1 = query.where().or().endsWith("Record", "Title").ne('age', '15').eq('Content', 'test').done().done();
- * var query2 = query.where().and().endsWith("Title", "Record").done().done();
- * var query3 = query.where().endsWith("Record", "Title").or().ne('age', '15').eq('Content', 'test').done().done();
- * var query4 = query.where().not().endsWith("Record", "Title").done().and().not().eq('Content', 'test').done().done().done();
- * var query5 = query.where().not().and().endsWith("Record", "Title").eq('Content', 'test').done().done().done();
- * var query6 = query.select("Id", "Title", "Content").expand('Tags').order("Title desc").where().ne('Title', 'zzz').eq('Title', 'newTitle').done()//.count();
- * var query7 = query.order("Title desc").where().eq('Title', 'newTitleUPDATE1').done().select("Title", "Content");
- * var query8 = query.where().eq('Title', 'newTitleN11').done();
+ * const query = new Sitefinity.Query();
+ * const query0 = query.where().and().endsWith("Title", "Record").done().or().startsWith('Title', 'asd').done().done();
+ * const query1 = query.where().or().endsWith("Record", "Title").ne('age', '15').eq('Content', 'test').done().done();
+ * const query2 = query.where().and().endsWith("Title", "Record").done().done();
+ * const query3 = query.where().endsWith("Record", "Title").or().ne('age', '15').eq('Content', 'test').done().done();
+ * const query4 = query.where().not().endsWith("Record", "Title").done().and().not().eq('Content', 'test').done().done().done();
+ * const query5 = query.where().not().and().endsWith("Record", "Title").eq('Content', 'test').done().done().done();
+ * const query6 = query.select("Id", "Title", "Content").expand('Tags').order("Title desc").where().ne('Title', 'zzz').eq('Title', 'newTitle').done()//.count();
+ * const query7 = query.order("Title desc").where().eq('Title', 'newTitleUPDATE1').done().select("Title", "Content");
+ * const query8 = query.where().eq('Title', 'newTitleN11').done();
  */
 var Query = /** @class */ (function (_super) {
     tslib_1.__extends(Query, _super);
     function Query() {
         var _this = _super.call(this) || this;
-        _this._order = null;
-        _this._skip = null;
-        _this._take = null;
-        _this._search = null;
-        _this._count = null;
-        _this.expr = null;
+        _this.orderProperties = null;
+        _this.skipValue = null;
+        _this.takeValue = null;
+        _this.searchValue = null;
+        _this.filter = null;
         return _this;
     }
     /**
     * Begins a where clause for filtering the items.
-    * @memberOf Query
-    * @returns {@link WhereQuery}
     */
     Query.prototype.where = function () {
-        var clone = this._clone(function (newObj) {
-            newObj.expr = new WhereQuery_1.WhereQuery(newObj);
+        var clone = this.clone(function (newObj) {
+            newObj.filter = new WhereQuery_1.WhereQuery(newObj);
         });
-        return clone.expr;
+        return clone.filter;
     };
     /**
     * Specifies the order by clause.
-    * @memberOf Query
     * @example
-    * // filter by single field
+    * order by single field
     * order("Title desc")
     * @example
-    * // filter by multiple fields
+    * order by multiple fields
     * order("Title desc", "Description asc")
-    * @returns {@link Query}
     */
     Query.prototype.order = function () {
-        var orderPropPaths = this._extractArguments(arguments);
-        this._validatePropertyPaths(orderPropPaths);
-        return this._clone(function (newObj) {
+        var properties = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            properties[_i] = arguments[_i];
+        }
+        properties = properties !== null && properties !== void 0 ? properties : [];
+        this.validatePropertyPaths(properties);
+        return this.clone(function (newObj) {
             var orderItems = [];
-            for (var i = 0; i < orderPropPaths.length; i++) {
-                var member = orderPropPaths[i];
+            for (var i = 0; i < properties.length; i++) {
+                var member = properties[i];
                 var orderProp = new OrderProperty_1.OrderProperty(member);
                 orderItems.push(orderProp);
             }
-            newObj._order = orderItems;
+            newObj.orderProperties = orderItems;
         });
     };
-    /** Skips a certain number of items from the beginning before returning the rest of the items. Used for paging.
-    * @memberOf Query.prototype
-    * @method skip
-    * @see [query.take]{@link query.take}
-    * @param {number} value The number of items to skip.
-    * @returns {Query}
+    /**
+    * Skips a certain number of items from the beginning before returning the rest of the items. Used for paging.
     */
     Query.prototype.skip = function (value) {
-        // validate
-        return this._clone(function (newObj) {
-            newObj._skip = value;
+        return this.clone(function (newObj) {
+            newObj.skipValue = value;
         });
     };
-    /** Takes a specified number of items from the query result. Used for paging.
-    * @memberOf Query.prototype
-    * @param {number} value The number of items to take.
-    * @returns {Query}
+    /**
+    * Takes a specified number of items from the query result. Used for paging.
     */
     Query.prototype.take = function (value) {
-        return this._clone(function (newObj) {
-            newObj._take = value;
+        return this.clone(function (newObj) {
+            newObj.takeValue = value;
         });
     };
-    /** Searches for the items matching the specified expression.
-    * @memberOf Query.prototype
-    * @param {string} value The search expression.
-    * @returns {Query}
+    /**
+    * Searches for the items matching the specified expression.
     */
     Query.prototype.search = function (value) {
-        return this._clone(function (newObj) {
-            newObj._search = value;
+        return this.clone(function (newObj) {
+            newObj.searchValue = value;
         });
     };
-    /** Returns the total item count with the result. Used for paging.
-    * @memberOf Query.prototype
-    * @param {inline} inline Whether to return only the count of the items with or without their JSON representation.
-    * @returns {Query}
+    /**
+    * Returns the total item count with the result. Used for paging.
     */
     Query.prototype.count = function (inline) {
         if (inline === void 0) { inline = true; }
-        return this._clone(function (newObj) {
-            newObj._count = inline;
+        return this.clone(function (newObj) {
+            newObj.inlineCount = inline;
         });
     };
-    Query.prototype._getFilter = function () {
-        return this.expr;
-    };
-    Query.prototype._getOrderBy = function () {
-        return this._order;
-    };
     Query.prototype.build = function () {
         return new QueryBuilder_1.QueryBuilder(this).build();
     };
@@ -1249,64 +624,49 @@ exports.Query = Query;
 /*!**************************!*\
   !*** ./src/QueryBase.ts ***!
   \**************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.QueryBase = void 0;
 var utils_1 = __webpack_require__(/*! ./utils */ "./src/utils.ts");
 /**
- * @classdesc The base class for dealing with queries.
- * @class QueryBase
+ * The base class for dealing with queries.
  */
 var QueryBase = /** @class */ (function () {
     function QueryBase() {
-        this._select = null;
-        this._expand = null;
+        this.selectProperties = null;
+        this.expandProperties = null;
     }
     /**
     * Selects which fields will be returned when querying the service.
-    * @memberOf QueryBase
-    * @instance
-    * @param {string} arguments - an array of fields to include in the $select statement.
-    * @returns {QueryBase}
     */
     QueryBase.prototype.select = function () {
-        var selectPropPaths = this._extractArguments(arguments);
-        this._validatePropertyPaths(selectPropPaths);
-        return this._clone(function (newObj) {
-            newObj._select = selectPropPaths.filter(function (prop, index, props) { return props.indexOf(prop) === index; });
+        var properties = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            properties[_i] = arguments[_i];
+        }
+        properties = properties !== null && properties !== void 0 ? properties : [];
+        this.validatePropertyPaths(properties);
+        return this.clone(function (newObj) {
+            newObj.selectProperties = properties.filter(function (prop, index, props) { return props.indexOf(prop) === index; });
         });
     };
     /**
     * Selects which navigation properties will be returned when querying the service.
-    * @memberOf QueryBase
-    * @instance
-    * @param {string} arguments - an array of fields to include in the $expand statement.
-    * @returns {QueryBase}
     */
     QueryBase.prototype.expand = function () {
-        var propPaths = this._extractArguments(arguments);
-        this._validatePropertyPaths(propPaths);
-        return this._clone(function (newObj) {
-            newObj._expand = propPaths.filter(function (prop, index, props) { return props.indexOf(prop) === index; });
-        });
-    };
-    QueryBase.prototype._extractArguments = function (arg) {
-        var values = [];
-        for (var index = 0; index < arg.length; index++) {
-            values.push(arg[index]);
+        var properties = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            properties[_i] = arguments[_i];
         }
-        return values;
-    };
-    QueryBase.prototype._getSelect = function () {
-        return this._select;
-    };
-    QueryBase.prototype._getExpand = function () {
-        return this._expand;
+        properties = properties !== null && properties !== void 0 ? properties : [];
+        this.validatePropertyPaths(properties);
+        return this.clone(function (newObj) {
+            newObj.expandProperties = properties.filter(function (prop, index, props) { return props.indexOf(prop) === index; });
+        });
     };
-    QueryBase.prototype._validatePropertyPaths = function (propPaths, allowNested) {
+    QueryBase.prototype.validatePropertyPaths = function (propPaths, allowNested) {
         if (allowNested === void 0) { allowNested = false; }
         for (var i = 0; i < propPaths.length; i++) {
             var member = propPaths[i];
@@ -1318,7 +678,7 @@ var QueryBase = /** @class */ (function () {
             }
         }
     };
-    QueryBase.prototype._clone = function (setter) {
+    QueryBase.prototype.clone = function (setter) {
         if (setter === void 0) { setter = null; }
         var newObj = utils_1.utils.clone(this, new QueryBase(), setter);
         return newObj;
@@ -1334,74 +694,65 @@ exports.QueryBase = QueryBase;
 /*!*****************************!*\
   !*** ./src/QueryBuilder.ts ***!
   \*****************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.QueryBuilder = void 0;
 var WhereQuery_1 = __webpack_require__(/*! ./WhereQuery */ "./src/WhereQuery.ts");
 var Expression_1 = __webpack_require__(/*! ./Expression */ "./src/Expression.ts");
 var OrderProperty_1 = __webpack_require__(/*! ./OrderProperty */ "./src/OrderProperty.ts");
 var utils_1 = __webpack_require__(/*! ./utils */ "./src/utils.ts");
-var constants = __webpack_require__(/*! ./constants */ "./src/constants.ts").default;
+var constants_1 = __webpack_require__(/*! ./constants */ "./src/constants.ts");
 var QueryBuilder = /** @class */ (function () {
     function QueryBuilder(query) {
         this.query = query;
     }
     QueryBuilder.prototype.build = function () {
         var queryParameters = {};
-        this._buildODataQueryParams(this.query, queryParameters);
-        return queryParameters;
-    };
-    QueryBuilder.prototype._buildODataQueryParams = function (query, queryParameters) {
-        var queryParams = constants.ODataParams;
-        var whereClause = query._getFilter();
+        var whereClause = this.query.filter;
         if (whereClause instanceof WhereQuery_1.WhereQuery) {
-            var expression = whereClause._getExpression();
+            var expression = whereClause.getExpression();
             if (expression instanceof Expression_1.ComplexExpression) {
-                var result = this._buildComplexExpression(expression, null);
+                var result = this.buildComplexExpression(expression, null);
                 if (result) {
-                    queryParameters[queryParams.$filter] = result;
+                    queryParameters[constants_1.ODATA_PARAMS.$filter] = result;
                 }
             }
         }
-        var selectClause = query._getSelect();
+        var selectClause = this.query.selectProperties;
         if (selectClause instanceof Array) {
-            queryParameters[queryParams.$select] = selectClause.join(', ');
+            queryParameters[constants_1.ODATA_PARAMS.$select] = selectClause.join(', ');
         }
-        var expandClause = query._getExpand();
+        var expandClause = this.query.expandProperties;
         if (expandClause instanceof Array)
-            queryParameters[queryParams.$expand] = expandClause.join(', ');
-        var orderByClause = query._order;
+            queryParameters[constants_1.ODATA_PARAMS.$expand] = expandClause.join(', ');
+        var orderByClause = this.query.orderProperties;
         if (orderByClause instanceof Array) {
             var order = [];
             for (var i in orderByClause) {
                 if (orderByClause[i] instanceof OrderProperty_1.OrderProperty)
                     order.push(orderByClause[i].getValue());
             }
-            queryParameters[queryParams.$orderby] = order.join(', ');
+            queryParameters[constants_1.ODATA_PARAMS.$orderby] = order.join(', ');
         }
-        var take = query._take;
+        var take = this.query.takeValue;
         if (utils_1.utils.isNumber(take))
-            queryParameters[queryParams.$top] = take;
-        var skip = query._skip;
+            queryParameters[constants_1.ODATA_PARAMS.$top] = take;
+        var skip = this.query.skipValue;
         if (utils_1.utils.isNumber(skip))
-            queryParameters[queryParams.$skip] = skip;
-        var search = query._search;
+            queryParameters[constants_1.ODATA_PARAMS.$skip] = skip;
+        var search = this.query.searchValue;
         if (search)
-            queryParameters[queryParams.$search] = search;
-        var count = query._count;
-        // means that the count is required inline
-        if (count !== null) {
-            queryParameters[queryParams.$count] = count;
+            queryParameters[constants_1.ODATA_PARAMS.$search] = search;
+        if (this.query.inlineCount !== null) {
+            queryParameters[constants_1.ODATA_PARAMS.$count] = this.query.inlineCount;
         }
         return queryParameters;
     };
-    QueryBuilder.prototype._buildComplexExpression = function (expression, parent) {
+    QueryBuilder.prototype.buildComplexExpression = function (expression, parent) {
         if (!(expression instanceof Expression_1.ComplexExpression))
             throw new Error('Invalid complex expression');
-        var OperatorType = constants.ExpressionType;
         var counter = 0;
         var result = '';
         var subExpressions = expression.getExpressions();
@@ -1411,24 +762,24 @@ var QueryBuilder = /** @class */ (function () {
         while (true) {
             var currentExp = subExpressions[counter];
             if (currentExp instanceof Expression_1.BinaryExpression) {
-                result += this._buildBinaryExpression(currentExp);
+                result += this.buildBinaryExpression(currentExp);
             }
             else if (currentExp instanceof Expression_1.ComplexExpression) {
-                var complexResult = this._buildComplexExpression(currentExp, expression.type);
+                var complexResult = this.buildComplexExpression(currentExp, expression.type);
                 if (complexResult) {
                     result += '(' + complexResult + ')';
                 }
             }
-            if (expression.getType() === OperatorType.not)
+            if (expression.getType() === constants_1.EXPRESSION_TYPE.not)
                 result = expression.getType() + ' ' + result;
             // TODOSDK: Rethink this!
-            if (expression.getType() === OperatorType.any) {
+            if (expression.getType() === constants_1.EXPRESSION_TYPE.any) {
                 var exprVal = [];
                 for (var index = 0; index < subExpressions.length; index++) {
-                    if (subExpressions[index].type == OperatorType.contains || subExpressions[index].type == OperatorType.startsWith || subExpressions[index].type == OperatorType.endsWith)
+                    if (subExpressions[index].type == constants_1.EXPRESSION_TYPE.contains || subExpressions[index].type == constants_1.EXPRESSION_TYPE.startsWith || subExpressions[index].type == constants_1.EXPRESSION_TYPE.endsWith)
                         exprVal.push(subExpressions[index].type.toLowerCase() + "(x, '" + subExpressions[index].constant + "')");
                     else
-                        exprVal.push('x ' + subExpressions[index].type.toLowerCase() + ' ' + this._checkType(subExpressions[index].constant));
+                        exprVal.push('x ' + subExpressions[index].type.toLowerCase() + ' ' + this.checkType(subExpressions[index].constant));
                 }
                 result = currentExp.parameter + '/' + expression.getType() + '(x:' + exprVal.join(' ' + parent + ' ') + ')';
             }
@@ -1439,48 +790,44 @@ var QueryBuilder = /** @class */ (function () {
         }
         return result;
     };
-    QueryBuilder.prototype._buildBinaryExpression = function (expression) {
-        if (!(expression instanceof Expression_1.BinaryExpression))
-            throw new Error('Invalid binary expression');
-        var ExpressionType = constants.ExpressionType;
+    QueryBuilder.prototype.buildBinaryExpression = function (expression) {
         var result = null;
         var type = expression.getType();
         switch (type) {
-            case ExpressionType.eq:
-            case ExpressionType.ne:
-            case ExpressionType.lt:
-            case ExpressionType.le:
-            case ExpressionType.gt:
-            case ExpressionType.ge:
+            case constants_1.EXPRESSION_TYPE.eq:
+            case constants_1.EXPRESSION_TYPE.ne:
+            case constants_1.EXPRESSION_TYPE.lt:
+            case constants_1.EXPRESSION_TYPE.le:
+            case constants_1.EXPRESSION_TYPE.gt:
+            case constants_1.EXPRESSION_TYPE.ge: {
                 var constant = expression.getConstant();
-                /*var template = '({0} {1} \'{2}\')';
-                if (/^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(constant))
-                    template = '({0} {1} {2})';*/
-                result = "(" + expression.getParameter() + " " + type + " " + this._checkType(constant) + ")";
+                result = "(".concat(expression.getParameter(), " ").concat(type, " ").concat(this.checkType(constant), ")");
                 break;
-            // TODO contains is substringOf in Odata ?
-            case ExpressionType.contains:
-            case ExpressionType.startsWith:
-            case ExpressionType.endsWith:
-                var expressionParameter = this._applyCaseSensitiveSettings(expression, expression.getParameter());
-                var expressionConstant = this._checkType(expression.getConstant());
-                var expressionValue = this._applyCaseSensitiveSettings(expression, expressionConstant);
-                result = type.toLowerCase() + "(" + expressionParameter + ", " + expressionValue + ")";
+            }
+            case constants_1.EXPRESSION_TYPE.contains:
+            case constants_1.EXPRESSION_TYPE.startsWith:
+            case constants_1.EXPRESSION_TYPE.endsWith: {
+                var expressionParameter = this.applyCaseSensitiveSettings(expression, expression.getParameter());
+                var expressionConstant = this.checkType(expression.getConstant());
+                var expressionValue = this.applyCaseSensitiveSettings(expression, expressionConstant);
+                result = "".concat(type.toLowerCase(), "(").concat(expressionParameter, ", ").concat(expressionValue, ")");
                 break;
-            default:
-                var msg = "Unsupported operator " + type;
+            }
+            default: {
+                var msg = "Unsupported operator ".concat(type);
                 throw new Error(msg);
+            }
         }
         return result;
     };
-    QueryBuilder.prototype._applyCaseSensitiveSettings = function (expression, value) {
+    QueryBuilder.prototype.applyCaseSensitiveSettings = function (expression, value) {
         if (expression.isCaseSensitive()) {
             return value;
         }
-        return "tolower(" + value + ")";
+        return "tolower(".concat(value, ")");
     };
-    QueryBuilder.prototype._checkType = function (constant) {
-        if (this._isGuid(constant))
+    QueryBuilder.prototype.checkType = function (constant) {
+        if (this.isGuid(constant))
             return constant;
         if (constant == null)
             return null;
@@ -1491,7 +838,7 @@ var QueryBuilder = /** @class */ (function () {
         constant = constant.replace(/'/g, "''");
         return "'" + constant + "'";
     };
-    QueryBuilder.prototype._isGuid = function (constant) {
+    QueryBuilder.prototype.isGuid = function (constant) {
         return /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(constant);
     };
     return QueryBuilder;
@@ -1505,30 +852,25 @@ exports.QueryBuilder = QueryBuilder;
 /*!**************************************!*\
   !*** ./src/Requests/BatchRequest.ts ***!
   \**************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.BatchRequest = exports.Transaction = void 0;
 var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.js");
-var Request_1 = __webpack_require__(/*! ./Request */ "./src/Requests/Request.ts");
 var BlobBuilder_1 = __webpack_require__(/*! ../BlobBuilder */ "./src/BlobBuilder.ts");
 var utils_1 = __webpack_require__(/*! ../utils */ "./src/utils.ts");
-var headerNames = __webpack_require__(/*! ../Headers */ "./src/Headers.ts").headerNames;
-var httpMethods = __webpack_require__(/*! ../HttpMethods */ "./src/HttpMethods.ts").default;
+var constants_1 = __webpack_require__(/*! ../constants */ "./src/constants.ts");
+var ExecutableRequest_1 = __webpack_require__(/*! ./ExecutableRequest */ "./src/Requests/ExecutableRequest.ts");
 /**
- * @classdesc The transaction class is used to group operations that involve data manipulation together and execute them as a single atomic operation.
- * @class Transaction
- * @param {object} urlOptions - The url options that are passed to the {@link _factory} object.
- * @param {object} _factory - The factory object used for request generation.
+ * The transaction class is used to group operations that involve data manipulation together and execute them as a single atomic operation.
  */
 var Transaction = /** @class */ (function () {
-    function Transaction(urlOptions, _factory) {
+    function Transaction(urlOptions, factory) {
         this.urlOptions = urlOptions;
-        this._factory = _factory;
-        this._requests = [];
-        this._counter = 0;
+        this.factory = factory;
+        this.requests = [];
+        this.counter = 0;
     }
     Transaction.prototype.upload = function (parameters) {
         var urlOptions = this.urlParametersClone(parameters.entitySet);
@@ -1538,17 +880,13 @@ var Transaction = /** @class */ (function () {
             contentType: parameters.contentType,
             fileName: parameters.fileName,
             key: parameters.key,
-            uploadProperties: JSON.stringify(parameters.uploadProperties)
+            uploadProperties: parameters.uploadProperties
         };
-        var request = this._factory.upload(options);
-        return this.addRequest(this, request);
+        var request = this.factory.upload(options);
+        return this.addRequest(request);
     };
     /**
     * Adds a POST request to create a single item.
-    * @memberOf Transaction
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {object} parameters.data - The payload of the request.
     */
     Transaction.prototype.create = function (parameters) {
         if (!(parameters || parameters.entitySet))
@@ -1558,19 +896,15 @@ var Transaction = /** @class */ (function () {
             key: parameters.key,
             action: parameters.action,
             urlOptions: urlOptions,
-            data: JSON.stringify(parameters.data)
+            data: parameters.data
         };
-        var request = this._factory.create(options);
-        return this.addRequest(this, request);
+        var request = this.factory.create(options);
+        return this.addRequest(request);
     };
     /**
     * Adds a POST request to execute an operation on single item.
-    * @memberOf Transaction
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item to be updated.
-    * @param {object} parameters.data - The payload of the request.
     */
+    // TODO: Remove
     Transaction.prototype.operation = function (parameters) {
         if (!(parameters || parameters.entitySet || parameters.key || parameters.data))
             throw "parameters: entitySet, key and data are required!";
@@ -1579,20 +913,14 @@ var Transaction = /** @class */ (function () {
             urlOptions: urlOptions,
             key: parameters.key,
             action: 'operation',
-            data: JSON.stringify(parameters.data)
+            data: parameters.data
         };
-        var request = this._factory.create(options);
-        this._overrideUrlGeneration(request, parameters.key, 'operation', options.urlOptions);
-        this.addRequest(this, request);
+        var request = this.factory.create(options);
+        this.overrideUrlGeneration(request, parameters.key, 'operation', options.urlOptions, options.query);
+        this.addRequest(request);
     };
     /**
     * Adds a PATCH request to update a single item.
-    * @memberOf Transaction
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {bool} parameters.saveTemp - A flag indicating whether to save in temp.
-    * @param {string} parameters.key - The identifier of the item to be updated.
-    * @param {object} parameters.data - The payload of the request.
     */
     Transaction.prototype.update = function (parameters) {
         if (!(parameters || parameters.entitySet || parameters.key || parameters.data))
@@ -1602,18 +930,14 @@ var Transaction = /** @class */ (function () {
             urlOptions: urlOptions,
             saveTemp: parameters.saveTemp,
             key: parameters.key,
-            data: JSON.stringify(parameters.data)
+            data: parameters.data
         };
-        var request = this._factory.update(options);
-        this._overrideUrlGeneration(request, parameters.key, undefined, options.urlOptions);
-        this.addRequest(this, request);
+        var request = this.factory.update(options);
+        this.overrideUrlGeneration(request, parameters.key, undefined, options.urlOptions, options.query);
+        this.addRequest(request);
     };
     /**
     * Adds a DELETE request to delete a single item.
-    * @memberOf Transaction
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item to be deleted.
     */
     Transaction.prototype.destroy = function (parameters) {
         if (!(parameters || parameters.entitySet || parameters.key))
@@ -1623,17 +947,12 @@ var Transaction = /** @class */ (function () {
             urlOptions: urlOptions,
             key: parameters.key
         };
-        var request = this._factory.destroy(options);
-        this._overrideUrlGeneration(request, parameters.key, undefined, options.urlOptions);
-        this.addRequest(this, request);
+        var request = this.factory.destroy(options);
+        this.overrideUrlGeneration(request, parameters.key, undefined, options.urlOptions, options.query);
+        this.addRequest(request);
     };
     /**
-    * Adds a DELETE request to retrieve the delete all of the associated members in the relation property.
-    * @memberOf Transaction
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property.
+    * Adds a DELETE request to delete all of the associated members in the relation property.
     */
     Transaction.prototype.destroyRelated = function (parameters) {
         if (!(parameters || parameters.entitySet || parameters.key))
@@ -1642,52 +961,40 @@ var Transaction = /** @class */ (function () {
         var options = {
             urlOptions: urlOptions,
             key: parameters.key,
-            navigationProperty: parameters.navigationProperty
+            property: parameters.property
         };
-        var request = this._factory.destroyRelated(options);
-        var navigationPropertyURL = request.navigationProperty + '/$ref';
-        this._overrideUrlGeneration(request, parameters.key, navigationPropertyURL, options.urlOptions);
-        this.addRequest(this, request);
+        var request = this.factory.destroyRelated(options);
+        var propertyURL = request.property + '/$ref';
+        this.overrideUrlGeneration(request, parameters.key, propertyURL, options.urlOptions, options.query);
+        this.addRequest(request);
     };
     /**
     * Adds a DELETE request to retrieve the a single entry of the associated members in the relation property.
-    * @memberOf Transaction
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property.
-    * @param {string} parameters.relatedKey - The identifier of the related item.
     */
     Transaction.prototype.destroyRelatedById = function (parameters) {
-        if (!(parameters || parameters.entitySet || parameters.key || parameters.relatedKey || parameters.navigationProperty))
-            throw "parameters: entitySet, key, relatedKey and navigationProperty are required!";
+        if (!(parameters || parameters.entitySet || parameters.key || parameters.relatedId || parameters.property))
+            throw "parameters: entitySet, key, relatedId and property are required!";
         var urlOptions = this.urlParametersClone(parameters.entitySet);
         var options = {
             urlOptions: urlOptions,
             key: parameters.key,
-            relatedKey: parameters.relatedKey,
-            navigationProperty: parameters.navigationProperty
+            relatedId: parameters.relatedId,
+            property: parameters.property
         };
-        var request = this._factory.destroyRelatedById(options);
-        this.addRequest(this, request);
+        var request = this.factory.destroyRelatedById(options);
+        this.addRequest(request);
     };
     /**
     * Adds a POST request to add a related item to the property collection.
-    * @memberOf Transaction
-    * @instance
-    * @see {@link Data.createRelated}
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property
     */
     Transaction.prototype.createRelated = function (parameters) {
-        if (!(parameters || parameters.entitySet || parameters.key || parameters.link || parameters.navigationProperty))
-            throw "parameters: entitySet, key, link and navigationProperty are required!";
+        if (!(parameters || parameters.entitySet || parameters.key || parameters.link || parameters.property))
+            throw "parameters: entitySet, key, link and property are required!";
         // TODO: rethink about the urls
         var urlOptions = this.urlParametersClone(parameters.entitySet);
-        for (var index = 0; index < this._requests.length; index += 1) {
-            if (this._requests[index].id == parameters.link) {
-                parameters.link = "$" + this._requests[index].id;
+        for (var index = 0; index < this.requests.length; index += 1) {
+            if (this.requests[index].id == parameters.link) {
+                parameters.link = "$" + this.requests[index].id;
             }
         }
         var data = {
@@ -1696,26 +1003,26 @@ var Transaction = /** @class */ (function () {
         var options = {
             urlOptions: urlOptions,
             key: parameters.key,
-            navigationProperty: parameters.navigationProperty,
-            data: JSON.stringify(data)
+            property: parameters.property,
+            data: data
         };
-        var request = this._factory.createRelated(options);
-        var navigationPropertyURL = request.navigationProperty + '/$ref';
-        this._overrideUrlGeneration(request, parameters.key, navigationPropertyURL, options.urlOptions);
-        return this.addRequest(this, request);
+        var request = this.factory.createRelated(options);
+        var propertyURL = request.property + '/$ref';
+        this.overrideUrlGeneration(request, parameters.key, propertyURL, options.urlOptions, options.query);
+        return this.addRequest(request);
     };
-    Transaction.prototype._overrideUrlGeneration = function (request, key, additionalPropertyURL, sfParams) {
+    Transaction.prototype.overrideUrlGeneration = function (request, key, additionalPropertyURL, urlOptions, query) {
         // TODO: match requests with Content-ID's!
-        // Content-ID's are the same as id's in _requests.
-        for (var index = 0; index < this._requests.length; index += 1) {
-            if (this._requests[index].id == key) {
-                request._buildUrl = function () {
+        // Content-ID's are the same as id's in requests.
+        for (var index = 0; index < this.requests.length; index += 1) {
+            if (this.requests[index].id == key) {
+                request.buildUrl = function () {
                     var uri = "$" + key;
                     if (additionalPropertyURL !== undefined) {
                         uri = uri + '/' + additionalPropertyURL;
                     }
-                    if (sfParams) {
-                        var queryString = request._getQueryString(sfParams);
+                    if (urlOptions) {
+                        var queryString = request.getQueryString(urlOptions, query);
                         if (queryString) {
                             uri = uri + queryString;
                         }
@@ -1725,9 +1032,9 @@ var Transaction = /** @class */ (function () {
             }
         }
     };
-    Transaction.prototype.addRequest = function (that, request) {
-        that._requests.push({ "id": that._counter, "request": request });
-        return that._counter++;
+    Transaction.prototype.addRequest = function (request) {
+        this.requests.push({ id: this.counter, request: request });
+        return this.counter++;
     };
     Transaction.prototype.urlParametersClone = function (entitySet) {
         var options = utils_1.utils.clone(this.urlOptions);
@@ -1736,50 +1043,40 @@ var Transaction = /** @class */ (function () {
     };
     return Transaction;
 }());
+exports.Transaction = Transaction;
 /**
- * @classdesc The batch request class is used for grouping requests into a single batch request to execute on the server.
- * @class BatchRequest
+ * The batch request class is used for grouping requests into a single batch request to execute on the server.
  */
 var BatchRequest = /** @class */ (function (_super) {
     tslib_1.__extends(BatchRequest, _super);
-    function BatchRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this._factory = options._factory;
-        _this._requests = [];
-        _this._counter = 0;
-        _this.boundary = _this._createBoundary("sf_batch_");
+    function BatchRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.factory = requestOptions.factory;
+        _this.requests = [];
+        _this.counter = 0;
+        _this.boundary = _this.createBoundary("sf_batch_");
         _this.responseHeaderRegex = /^([^()<>@,;:\\"\/[\]?={} \t]+)\s?:\s?(.*)/;
         _this.responseStatusRegex = /^HTTP\/1\.\d (\d{3}) (.*)$/i;
         return _this;
     }
     /**
     * Adds a GET request to retrieve a collection of items.
-    * @memberOf BatchRequest
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {object} parameters.query - The {@link WhereQuery} with which to filter the items
     */
     BatchRequest.prototype.get = function (parameters) {
         if (!(parameters || parameters.entitySet))
             throw "entitySet is required!";
         var urlOptions = this.urlParametersClone(parameters.entitySet);
-        if (parameters && parameters.query)
-            urlOptions.ODataParams = parameters.query;
         var options = {
             urlOptions: urlOptions,
             action: parameters.action,
-            fallbackProperties: parameters.fallbackPropertyNames
+            query: parameters.query,
+            fallbackProperties: parameters.fallbackProperties
         };
-        var request = this._factory.get(options);
+        var request = this.factory.get(options);
         this.addRequest(request);
     };
     /**
     * Adds a GET request for the retrieval of a single item.
-    * @memberOf BatchRequest
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {object} parameters.query - The {@link QueryBase} object containing the OData query options that should be sent to the server.
-    * @param {string} parameters.key - The identifier of the item to be retrieved.
     */
     BatchRequest.prototype.getSingle = function (parameters) {
         if (!(parameters || parameters.entitySet || parameters.key))
@@ -1788,20 +1085,14 @@ var BatchRequest = /** @class */ (function (_super) {
         var options = {
             urlOptions: urlOptions,
             action: parameters.action,
-            key: parameters.key
+            key: parameters.key,
+            query: parameters.query
         };
-        if (parameters.query)
-            options.ODataParams = parameters.query;
-        var request = this._factory.getSingle(options);
+        var request = this.factory.getSingle(options);
         this.addRequest(request);
     };
     /**
     * Adds a GET request to get the property of a single item.
-    * @memberOf BatchRequest
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.property - The name of the property to be retrieved.
     */
     BatchRequest.prototype.getProperty = function (parameters) {
         if (!(parameters || parameters.entitySet || parameters.key, parameters.property))
@@ -1810,132 +1101,116 @@ var BatchRequest = /** @class */ (function (_super) {
         var options = {
             urlOptions: urlOptions,
             key: parameters.key,
-            navigationProperty: parameters.property
+            property: parameters.property
         };
-        var request = this._factory.getProperty(options);
+        var request = this.factory.getProperty(options);
         this.addRequest(request);
     };
     /**
     * Adds a GET request to get the related property value of a single item.
-    * @memberOf BatchRequest
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property to be retrieved.
     */
     BatchRequest.prototype.getRelated = function (parameters) {
-        if (!(parameters || parameters.entitySet || parameters.key || parameters.navigationProperty))
-            throw "parameters: entitySet, key and navigationProperty are required!";
+        if (!(parameters || parameters.entitySet || parameters.key || parameters.property))
+            throw "parameters: entitySet, key and property are required!";
         var urlOptions = this.urlParametersClone(parameters.entitySet);
         var options = {
             urlOptions: urlOptions,
             key: parameters.key,
-            navigationProperty: parameters.navigationProperty
+            property: parameters.property
         };
-        var request = this._factory.getRelated(options);
+        var request = this.factory.getRelated(options);
         this.addRequest(request);
     };
     /**
     * Adds a GET request to retrieve the related property value of a single item by the id of the related item.
-    * @memberOf BatchRequest
-    * @instance
-    * @param {object} parameters - The parameters for the request.
-    * @param {string} parameters.key - The identifier of the item.
-    * @param {string} parameters.navigationProperty - The name of the navigation property to be retrieved.
-    * @param {string} parameters.relatedKey - The identifier of the related item.
     */
     BatchRequest.prototype.getRelatedById = function (parameters) {
-        if (!(parameters || parameters.entitySet || parameters.key || parameters.relatedKey || parameters.navigationProperty))
-            throw "parameters: entitySet, key, relatedKey and navigationProperty are required!";
+        if (!(parameters || parameters.entitySet || parameters.key || parameters.relatedId || parameters.property))
+            throw "parameters: entitySet, key, relatedId and property are required!";
         var urlOptions = this.urlParametersClone(parameters.entitySet);
         var options = {
             urlOptions: urlOptions,
             key: parameters.key,
-            relatedKey: parameters.relatedKey,
-            navigationProperty: parameters.navigationProperty
+            relatedId: parameters.relatedId,
+            property: parameters.property
         };
-        var request = this._factory.getRelatedById(options);
+        var request = this.factory.getRelatedById(options);
         this.addRequest(request);
     };
     /**
     * Begins a transaction.
-    * @memberOf BatchRequest
-    * @instance
-    * @returns {@link Transaction}
     */
     BatchRequest.prototype.beginTransaction = function () {
         var option = utils_1.utils.clone(this.urlOptions);
-        var newTransaction = new Transaction(option, this._factory);
-        newTransaction.id = ++this._counter;
+        var newTransaction = new Transaction(option, this.factory);
+        newTransaction.id = ++this.counter;
         return newTransaction;
     };
     /**
     * Ends a transaction.
-    * @memberOf BatchRequest
-    * @instance
     */
     BatchRequest.prototype.endTransaction = function (transaction) {
-        this._requests.push({
+        this.requests.push({
             id: transaction.id,
             request: transaction
         });
     };
-    BatchRequest.prototype._getBody = function () {
-        return this._buildRequestBody();
+    BatchRequest.prototype.getBody = function () {
+        return this.buildRequestBody();
     };
-    BatchRequest.prototype._getMethod = function () {
-        return httpMethods.Post;
+    BatchRequest.prototype.getMethod = function () {
+        return constants_1.HTTP_METHODS.post;
     };
-    BatchRequest.prototype._getHeaders = function () {
+    BatchRequest.prototype.getHeaders = function () {
         var contentType = "multipart/mixed; boundary=" + this.boundary;
         var headers = {};
-        headers[headerNames.contentType] = contentType;
+        headers[constants_1.HEADER_NAMES.contentType] = contentType;
         return headers;
     };
-    BatchRequest.prototype._buildUrl = function () {
+    BatchRequest.prototype.buildUrl = function () {
         var url = this.urlOptions.baseUrl + "$batch";
-        var queryString = this._getQueryString(this.urlOptions);
+        var queryString = this.getQueryString(this.urlOptions, this.query);
         if (queryString) {
             url += queryString;
         }
         return url;
     };
-    BatchRequest.prototype._parseResponse = function (http) {
+    BatchRequest.prototype.parseResponse = function (http) {
         var context = {
             position: 0,
             boundaries: []
         };
         var pos = context.position;
-        var partHeaders = this._readHeaders(http.getAllResponseHeaders(), context);
-        var partContentType = this._contentType(partHeaders["content-type"]);
+        var partHeaders = this.readHeaders(http.getAllResponseHeaders(), context);
+        var partContentType = this.contentType(partHeaders["content-type"]);
         if (partContentType && partContentType.mediaType == "multipart/mixed") {
             context.boundaries.push(partContentType.properties.boundary);
         }
         context.position = pos;
-        var batchResponse = this._parseBatchResponse(http.responseText, context);
+        var batchResponse = this.parseBatchResponse(http.responseText, context);
         var responseParsed = [];
         for (var i = 0; i < batchResponse.length; i++) {
             try {
-                var currentRequest = this._requests[i];
+                var currentRequest = this.requests[i];
                 var finalResult = null;
                 var key = null;
                 var singleResponse = batchResponse[i];
                 var changesets = singleResponse.__changeResponses;
                 if (changesets) {
                     finalResult = [];
-                    var currentRequests = currentRequest ? currentRequest.request._requests : [];
+                    var currentRequests = currentRequest ? currentRequest.request.requests : [];
                     for (var j = 0; j < changesets.length; j++) {
-                        key = currentRequests[j] ? currentRequests[j].request.request.key : null;
+                        key = currentRequests[j] ? currentRequests[j].request.key : null;
                         var changeset = changesets[j];
                         var response = changeset.response;
-                        var responseResult = this._getResponseResult(response, key);
+                        var responseResult = this.getResponseResult(response, key);
                         finalResult.push(responseResult);
                     }
                 }
                 else {
                     key = currentRequest ? currentRequest.request.key : null;
                     var response = singleResponse.response;
-                    finalResult = this._getResponseResult(response, key);
+                    finalResult = this.getResponseResult(response, key);
                 }
                 var statusCodeCheck = function (r) {
                     return r.statusCode >= 400;
@@ -1963,38 +1238,38 @@ var BatchRequest = /** @class */ (function (_super) {
         var batchIsSuccessful = responseParsed.filter(isSuccessfulCheck).length === 0;
         return { data: responseParsed, isSuccessful: batchIsSuccessful };
     };
-    BatchRequest.prototype._parseBatchResponse = function (text, context) {
+    BatchRequest.prototype.parseBatchResponse = function (text, context) {
         // get boundary from response
-        var delimiter = "--" + this._currentBoundary(context);
-        this._readTo(text, delimiter, context);
-        this._readLine(text, context);
+        var delimiter = "--" + this.currentBoundary(context);
+        this.readTo(text, delimiter, context);
+        this.readLine(text, context);
         var responses = [];
         var partEnd;
         while (partEnd !== "--" && context.position < text.length) {
-            var partHeaders = this._readHeaders(text, context);
-            var partContentType = this._contentType(partHeaders["content-type"]);
-            var changeResponses;
+            var partHeaders = this.readHeaders(text, context);
+            var partContentType = this.contentType(partHeaders["content-type"]);
+            var changeResponses = void 0;
             if (partContentType && partContentType.mediaType === "multipart/mixed") {
                 context.boundaries.push(partContentType.properties.boundary);
                 try {
-                    changeResponses = this._parseBatchResponse(text, context);
+                    changeResponses = this.parseBatchResponse(text, context);
                 }
                 catch (e) {
-                    e.response = this._readResponse(text, context, delimiter);
+                    e.response = this.readResponse(text, context, delimiter);
                     changeResponses = [e];
                 }
                 responses.push({ __changeResponses: changeResponses });
                 context.boundaries.pop();
-                this._readTo(text, "--" + this._currentBoundary(context), context);
+                this.readTo(text, "--" + this.currentBoundary(context), context);
             }
             else {
                 if (!partContentType || partContentType.mediaType !== "application/http") {
                     throw { message: "invalid MIME part type " };
                 }
                 // Skip empty line
-                this._readLine(text, context);
+                this.readLine(text, context);
                 // Read the response
-                var response = this._readResponse(text, context, delimiter);
+                var response = this.readResponse(text, context, delimiter);
                 try {
                     if (response.statusCode >= 200 && response.statusCode <= 299) {
                         response = { message: response.statusCode + " Http request is OK", response: response };
@@ -2011,11 +1286,11 @@ var BatchRequest = /** @class */ (function (_super) {
             }
             partEnd = text.substr(context.position, 2);
             // Ignore the incoming line.
-            this._readLine(text, context);
+            this.readLine(text, context);
         }
         return responses;
     };
-    BatchRequest.prototype._getResponseResult = function (response, key) {
+    BatchRequest.prototype.getResponseResult = function (response, key) {
         var responseBody = response.body;
         var data = utils_1.utils.parseStringToJson(responseBody);
         return {
@@ -2025,11 +1300,11 @@ var BatchRequest = /** @class */ (function (_super) {
             headers: response.headers
         };
     };
-    BatchRequest.prototype._currentBoundary = function (context) {
+    BatchRequest.prototype.currentBoundary = function (context) {
         var boundaries = context.boundaries;
         return boundaries[boundaries.length - 1];
     };
-    BatchRequest.prototype._contentType = function (str) {
+    BatchRequest.prototype.contentType = function (str) {
         if (!str) {
             return null;
         }
@@ -2042,7 +1317,7 @@ var BatchRequest = /** @class */ (function (_super) {
         }
         return { mediaType: contentTypeParts[0].replace(/^\s+|\s+$/g, ''), properties: properties };
     };
-    BatchRequest.prototype._readTo = function (text, str, context) {
+    BatchRequest.prototype.readTo = function (text, str, context) {
         var start = context.position || 0;
         var end = text.length;
         if (str) {
@@ -2057,17 +1332,17 @@ var BatchRequest = /** @class */ (function (_super) {
         }
         return text.substring(start, end);
     };
-    BatchRequest.prototype._readLine = function (text, context) {
-        return this._readTo(text, BatchRequest.constants.newLine, context);
+    BatchRequest.prototype.readLine = function (text, context) {
+        return this.readTo(text, BatchRequest.constants.newLine, context);
     };
-    BatchRequest.prototype._readHeaders = function (text, context) {
+    BatchRequest.prototype.readHeaders = function (text, context) {
         var headers = {};
         var parts;
         var line;
         var pos;
         do {
             pos = context.position;
-            line = this._readLine(text, context);
+            line = this.readLine(text, context);
             parts = this.responseHeaderRegex.exec(line);
             if (parts !== null) {
                 headers[parts[1].toLowerCase()] = parts[2];
@@ -2079,18 +1354,18 @@ var BatchRequest = /** @class */ (function (_super) {
         } while (line && parts);
         return headers;
     };
-    BatchRequest.prototype._readResponse = function (text, context, delimiter) {
+    BatchRequest.prototype.readResponse = function (text, context, delimiter) {
         // Read the status line.
         var pos = context.position;
-        var match = this.responseStatusRegex.exec(this._readLine(text, context));
+        var match = this.responseStatusRegex.exec(this.readLine(text, context));
         var statusCode;
         var statusText;
         var headers;
         if (match) {
             statusCode = match[1];
             statusText = match[2];
-            headers = this._readHeaders(text, context);
-            this._readLine(text, context);
+            headers = this.readHeaders(text, context);
+            this.readLine(text, context);
         }
         else {
             context.position = pos;
@@ -2099,71 +1374,71 @@ var BatchRequest = /** @class */ (function (_super) {
             statusCode: statusCode,
             statusText: statusText,
             headers: headers,
-            body: this._readTo(text, BatchRequest.constants.newLine + delimiter, context)
+            body: this.readTo(text, BatchRequest.constants.newLine + delimiter, context)
         };
     };
-    BatchRequest.prototype._buildRequestBody = function () {
+    BatchRequest.prototype.buildRequestBody = function () {
         var builder = new BlobBuilder_1.BlobBuilder();
         builder.append('');
-        for (var index = 0; index < this._requests.length; index += 1) {
-            var request = this._requests[index].request;
+        for (var index = 0; index < this.requests.length; index += 1) {
+            var request = this.requests[index].request;
             if (index != 0)
                 builder.append(BatchRequest.constants.newLine + BatchRequest.constants.newLine);
             builder.append("--" + this.boundary);
             if (request instanceof Transaction) {
-                builder.append(this._buildTransaction(request));
+                builder.append(this.buildTransaction(request));
             }
             else {
-                builder.append(this._buildRequest(request));
+                builder.append(this.buildRequest(request));
             }
         }
-        builder.append(this._createDelimeter(this.boundary, true));
+        builder.append(this.createDelimeter(this.boundary, true));
         return builder.build();
     };
-    BatchRequest.prototype._buildRequest = function (request) {
+    BatchRequest.prototype.buildRequest = function (request) {
         var builder = new BlobBuilder_1.BlobBuilder();
         builder.append(BatchRequest.constants.newLine + 'Content-Type: application/http' +
             BatchRequest.constants.newLine + 'Content-Transfer-Encoding: binary' +
             BatchRequest.constants.newLine +
             BatchRequest.constants.newLine +
-            request._getMethod() +
-            ' ' + request._buildUrl() + ' HTTP/1.1');
+            request.getMethod() +
+            ' ' + request.buildUrl() + ' HTTP/1.1');
         return builder.build();
     };
-    BatchRequest.prototype._buildTransaction = function (transaction) {
-        if (transaction._requests.length == 0)
+    BatchRequest.prototype.buildTransaction = function (transaction) {
+        if (transaction.requests.length == 0)
             return;
         var builder = new BlobBuilder_1.BlobBuilder();
         builder.append(BatchRequest.constants.newLine);
-        var changeset = this._createBoundary("sf_changeset_");
+        var changeset = this.createBoundary("sf_changeset_");
         builder.append('Content-Type: multipart/mixed; boundary=' + changeset);
-        var changesetRequests = transaction._requests;
+        var changesetRequests = transaction.requests;
         for (var index = 0; index < changesetRequests.length; index += 1) {
             var currentRequest = changesetRequests[index].request;
             // we shouldn't add new lines after blob content. Otherwise they are added to the blob and corrupt it
-            var shouldAddNewLine = index === 0 || !utils_1.utils.isBlob(changesetRequests[index - 1].request._getBody());
-            builder.append(this._createDelimeter(changeset, false, shouldAddNewLine) +
+            var shouldAddNewLine = index === 0 || !utils_1.utils.isBlob(changesetRequests[index - 1].request.getBody());
+            builder.append(this.createDelimeter(changeset, false, shouldAddNewLine) +
                 BatchRequest.constants.newLine + 'Content-Type: application/http' +
                 BatchRequest.constants.newLine + 'Content-Transfer-Encoding: binary' +
                 BatchRequest.constants.newLine + 'Content-ID: ' + changesetRequests[index].id);
-            var requestUrl = currentRequest._buildUrl();
-            builder.append(BatchRequest.constants.newLine + BatchRequest.constants.newLine + currentRequest._getMethod() + ' ' + requestUrl + ' HTTP/1.1');
-            var headers = currentRequest._getHeaders();
+            var requestUrl = currentRequest.buildUrl();
+            builder.append(BatchRequest.constants.newLine + BatchRequest.constants.newLine + currentRequest.getMethod() + ' ' + requestUrl + ' HTTP/1.1');
+            var headers = currentRequest.getHeaders();
             var headerNames = Object.keys(headers);
             for (var i = 0; i < headerNames.length; i++) {
                 var headerName = headerNames[i];
                 builder.append(BatchRequest.constants.newLine + headerName + ": " + headers[headerName]);
             }
-            var body = currentRequest._getBody();
+            var body = utils_1.utils.serializeToJSON(currentRequest.getBody());
             if (body) {
                 builder.append(BatchRequest.constants.newLine + BatchRequest.constants.newLine);
                 builder.append(body);
             }
         }
-        builder.append(this._createDelimeter(changeset, true));
+        builder.append(this.createDelimeter(changeset, true));
         return builder.build();
     };
-    BatchRequest.prototype._createDelimeter = function (boundary, close, shouldAddNewLine) {
+    BatchRequest.prototype.createDelimeter = function (boundary, close, shouldAddNewLine) {
         if (shouldAddNewLine === void 0) { shouldAddNewLine = true; }
         var result = "";
         if (shouldAddNewLine) {
@@ -2176,21 +1451,24 @@ var BatchRequest = /** @class */ (function (_super) {
         }
         return result;
     };
-    BatchRequest.prototype._createBoundary = function (prefix) {
+    BatchRequest.prototype.createBoundary = function (prefix) {
         return prefix + utils_1.utils.hex16() + '-' + utils_1.utils.hex16() + '-' + utils_1.utils.hex16();
     };
     BatchRequest.prototype.addRequest = function (request) {
-        return Transaction.prototype.addRequest(this, request);
+        this.requests.push({ id: this.counter, request: request });
+        return this.counter++;
     };
     BatchRequest.prototype.urlParametersClone = function (entitySet) {
-        return Transaction.prototype.urlParametersClone.call(this, entitySet);
+        var options = utils_1.utils.clone(this.urlOptions);
+        options.entitySet = entitySet;
+        return options;
     };
     BatchRequest.constants = {
         newLine: '\r\n'
     };
     return BatchRequest;
-}(Request_1.RequestBase));
-module.exports = BatchRequest;
+}(ExecutableRequest_1.ExecutableRequest));
+exports.BatchRequest = BatchRequest;
 
 
 /***/ }),
@@ -2199,90 +1477,70 @@ module.exports = BatchRequest;
 /*!*******************************************!*\
   !*** ./src/Requests/ExecutableRequest.ts ***!
   \*******************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ExecutableRequest = void 0;
+var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.js");
+var RequestBase_1 = __webpack_require__(/*! ./RequestBase */ "./src/Requests/RequestBase.ts");
 var utils_1 = __webpack_require__(/*! ../utils */ "./src/utils.ts");
-var headerNames = __webpack_require__(/*! ../Headers */ "./src/Headers.ts").headerNames;
+var constants_1 = __webpack_require__(/*! ../constants */ "./src/constants.ts");
 var XMLHttpRequestDone = 4;
-function isFunction(func) {
-    return typeof func === 'function';
-}
-var ExecutableRequest = /** @class */ (function () {
-    function ExecutableRequest(options) {
-        this._getMethod = function () {
-            return this.request._getMethod();
-        };
-        this._getHeaders = function () {
-            return this.request._getHeaders();
-        };
-        this._getQueryString = function (urlOptions) {
-            return this.request._getQueryString(urlOptions);
-        };
-        this._buildUrl = function () {
-            return this.request._buildUrl();
-        };
-        this.request = options.request;
-        this.handlers = options.handlers;
-        this.token = options.token;
-        this.enableUnlimitedChoices = options.enableUnlimitedChoices;
-        this.integrationMode = options.integrationMode;
+var ExecutableRequest = /** @class */ (function (_super) {
+    tslib_1.__extends(ExecutableRequest, _super);
+    function ExecutableRequest(requestOptions, token, sdkOptions) {
+        var _this = this;
+        var _a, _b;
+        _this = _super.call(this, requestOptions) || this;
+        _this.token = token;
+        _this.successCb = _this.successCb || ((_a = sdkOptions.handlers) === null || _a === void 0 ? void 0 : _a.successCb);
+        _this.failureCb = _this.failureCb || ((_b = sdkOptions.handlers) === null || _b === void 0 ? void 0 : _b.failureCb);
+        _this.enableUnlimitedChoices = sdkOptions.enableUnlimitedChoices;
+        _this.integrationMode = sdkOptions.integrationMode;
+        return _this;
     }
     ExecutableRequest.prototype.execute = function () {
-        this._execute();
-    };
-    ExecutableRequest.prototype._execute = function () {
         var _this = this;
         var http = new XMLHttpRequest();
         http.onreadystatechange = function () {
             if (http.readyState === XMLHttpRequestDone) {
                 if (http.status > 0) {
-                    var data = _this.request._parseResponse(http);
+                    var data = _this.parseResponse(http);
                     if (http.status >= 200 && http.status <= 206) {
-                        if (isFunction(_this.request.successCb)) {
-                            _this.request.successCb(data);
-                        }
-                        if (_this.handlers && isFunction(_this.handlers.successCb)) {
-                            _this.handlers.successCb(data);
+                        if (utils_1.utils.isFunction(_this.successCb)) {
+                            _this.successCb(data);
                         }
                     }
                     else if (http.status >= 400) {
                         // When the data is string, we save the string as message
                         // and convert the data to normal object with message property
                         if (utils_1.utils.isString(data)) {
-                            var message = data;
                             data = {
-                                message: message
+                                message: data
                             };
                         }
                         data.status = http.status;
                         // in case of errors we would like there to be one handler for all of the errors
-                        if (isFunction(_this.request.failureCb)) {
-                            _this.request.failureCb(data);
-                        }
-                        if (_this.handlers && isFunction(_this.handlers.failureCb)) {
-                            _this.handlers.failureCb(data);
+                        if (utils_1.utils.isFunction(_this.failureCb)) {
+                            _this.failureCb(data);
                         }
                     }
                 }
             }
         };
-        if (isFunction(this.request.progressCb)) {
+        if (utils_1.utils.isFunction(this.progressCb)) {
             if (http.upload) {
-                var that = this;
                 http.upload.onprogress = function (event) {
-                    that.request.progressCb(event);
+                    _this.progressCb(event);
                 };
             }
         }
-        var method = this._getMethod();
-        var url = this._buildUrl();
+        var method = this.getMethod();
+        var url = this.buildUrl();
         http.open(method, url, true);
-        this.setHeaders(http, this._getHeaders());
-        http.send(this._getBody());
+        this.setHeaders(http, this.getHeaders());
+        http.send(utils_1.utils.serializeToJSON(this.getBody()));
     };
     ExecutableRequest.prototype.setHeaders = function (http, headers) {
         var headerKeys = Object.keys(headers);
@@ -2293,27 +1551,23 @@ var ExecutableRequest = /** @class */ (function () {
         if (this.token) {
             if (typeof this.token === 'string') {
                 // for backward compatibility
-                http.setRequestHeader(headerNames.authorization, this.token);
+                http.setRequestHeader(constants_1.HEADER_NAMES.authorization, this.token);
             }
             else {
-                http.setRequestHeader(headerNames.authorization, this.token.type + " " + this.token.value);
+                http.setRequestHeader(constants_1.HEADER_NAMES.authorization, this.token.type + " " + this.token.value);
             }
         }
         if (this.enableUnlimitedChoices) {
-            http.setRequestHeader(headerNames.choicesBinaryRepresentation, true);
+            http.setRequestHeader(constants_1.HEADER_NAMES.choicesBinaryRepresentation, "true");
         }
         if (this.integrationMode) {
-            http.setRequestHeader(headerNames.integrationMode, "true");
+            http.setRequestHeader(constants_1.HEADER_NAMES.integrationMode, "true");
         }
         // for backward compatibility
-        http.setRequestHeader(headerNames.serviceRequest, "true");
-    };
-    ExecutableRequest.prototype._getBody = function () {
-        var body = utils_1.utils.serializeToJSON(this.request._getBody());
-        return body;
+        http.setRequestHeader(constants_1.HEADER_NAMES.serviceRequest, "true");
     };
     return ExecutableRequest;
-}());
+}(RequestBase_1.RequestBase));
 exports.ExecutableRequest = ExecutableRequest;
 
 
@@ -2323,389 +1577,383 @@ exports.ExecutableRequest = ExecutableRequest;
 /*!*********************************!*\
   !*** ./src/Requests/Request.ts ***!
   \*********************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.UploadRequest = exports.CreateRelatedRequest = exports.DeleteRelatedByIdRequest = exports.DeleteRelatedRequest = exports.GetRelatedByIdRequest = exports.GetRelatedRequest = exports.CreateRequest = exports.UpdateRequest = exports.DeleteRequest = exports.GetByIdRequest = exports.GetRequest = void 0;
 var tslib_1 = __webpack_require__(/*! tslib */ "./node_modules/tslib/tslib.es6.js");
+var constants_1 = __webpack_require__(/*! ../constants */ "./src/constants.ts");
 var utils_1 = __webpack_require__(/*! ../utils */ "./src/utils.ts");
-var constants = __webpack_require__(/*! ../constants */ "./src/constants.ts").default;
-var headerNames = __webpack_require__(/*! ../Headers */ "./src/Headers.ts").headerNames;
-var contentTypes = __webpack_require__(/*! ../ContentTypes */ "./src/ContentTypes.ts").default;
-var httpMethods = __webpack_require__(/*! ../HttpMethods */ "./src/HttpMethods.ts").default;
-var RequestBase = /** @class */ (function () {
-    function RequestBase(options) {
-        this.successCb = options.successCb;
-        this.failureCb = options.failureCb;
-        this.urlOptions = options.urlOptions;
-        this.progressCb = options.progressCb;
-        this.key = options.key;
-        this.action = options.action;
-        this._fallbackProperties = options.fallbackProperties;
-    }
-    RequestBase.prototype._getBody = function () {
-        return undefined;
-    };
-    RequestBase.prototype._getMethod = function () {
-        return null;
-    };
-    RequestBase.prototype._getHeaders = function () {
-        var headers = {};
-        headers[headerNames.contentType] = contentTypes.json;
-        return headers;
-    };
-    RequestBase.prototype._getQueryParameters = function (paramDictionary, urlOptions) {
-        if (urlOptions.ODataParams) {
-            var query = urlOptions.ODataParams.build();
-            if (utils_1.utils.isString(query.$filter))
-                paramDictionary[constants.ODataParams.$filter] = query.$filter;
-            if (utils_1.utils.isString(query.$select))
-                paramDictionary[constants.ODataParams.$select] = query.$select;
-            if (utils_1.utils.isString(query.$expand))
-                paramDictionary[constants.ODataParams.$expand] = query.$expand;
-            if (utils_1.utils.isString(query.$orderby))
-                paramDictionary[constants.ODataParams.$orderby] = query.$orderby;
-            if (utils_1.utils.isNumber(query.$skip))
-                paramDictionary[constants.ODataParams.$skip] = query.$skip;
-            if (utils_1.utils.isNumber(query.$top))
-                paramDictionary[constants.ODataParams.$top] = query.$top;
-            if (utils_1.utils.isString(query.$search))
-                paramDictionary[constants.ODataParams.$search] = query.$search;
-            // inline count
-            if (utils_1.utils.isBoolean(query.$count) && query.$count)
-                paramDictionary[constants.ODataParams.$count] = query.$count;
-        }
-        if (urlOptions.SFParams) {
-            var sfParams = urlOptions.SFParams;
-            if (sfParams.provider) {
-                paramDictionary[constants.SfParams.provider] = sfParams.provider;
-            }
-            if (sfParams.culture) {
-                paramDictionary[constants.SfParams.culture] = sfParams.culture;
-            }
-            if (sfParams.siteId) {
-                paramDictionary[constants.SfParams.siteId] = sfParams.siteId;
-            }
-        }
-        if (this._fallbackProperties) {
-            paramDictionary["sf_fallback_prop_names"] = this._fallbackProperties.join();
-        }
-        if (urlOptions.additionalQueryParams) {
-            for (var key in urlOptions.additionalQueryParams) {
-                if (urlOptions.additionalQueryParams.hasOwnProperty(key)) {
-                    paramDictionary[key] = urlOptions.additionalQueryParams[key];
-                }
-            }
-        }
-    };
-    RequestBase.prototype._getQueryString = function (urlOptions) {
-        var paramDictionary = {};
-        this._getQueryParameters(paramDictionary, urlOptions);
-        var keys = Object.keys(paramDictionary);
-        if (keys.length == 0)
-            return null;
-        var queryString = "?";
-        for (var prop in paramDictionary) {
-            queryString += prop + "=" + paramDictionary[prop] + "&";
-        }
-        queryString = queryString.substring(0, queryString.length - 1);
-        return queryString;
-    };
-    RequestBase.prototype._buildUrl = function () {
-        var url = this.urlOptions.baseUrl + (this.urlOptions.entitySet || "");
-        url += this.key ? ("(" + this.key + ")") : "";
-        if (this.action) {
-            url += url.endsWith("/") ? "" : "/";
-            url += this.action;
-        }
-        // including count here
-        // not the best solution as build() is called once more in getQueryString
-        // but not that big of an issue right now
-        if (this.urlOptions.ODataParams) {
-            var getCount = this.urlOptions.ODataParams.build().$count;
-            if (utils_1.utils.isBoolean(getCount) && !getCount) {
-                url += "/$count";
-            }
-        }
-        return this._addQueryParameters(url);
-    };
-    RequestBase.prototype._parseResponse = function (http) {
-        var data = utils_1.utils.parseStringToJson(http.responseText);
-        if (data) {
-            if (http.status >= 400 && data.error) {
-                return data.error;
-            }
-            return data;
-        }
-        return http.responseText;
-    };
-    RequestBase.prototype._addQueryParameters = function (url) {
-        var queryString = this._getQueryString(this.urlOptions);
-        if (queryString) {
-            if (url.indexOf("?") > -1 && queryString[0] == "?") {
-                queryString = "&" + queryString.substring(1);
-            }
-            url += queryString;
-        }
-        return url;
-    };
-    return RequestBase;
-}());
-exports.RequestBase = RequestBase;
+var ExecutableRequest_1 = __webpack_require__(/*! ./ExecutableRequest */ "./src/Requests/ExecutableRequest.ts");
 var GetRequest = /** @class */ (function (_super) {
     tslib_1.__extends(GetRequest, _super);
-    function GetRequest(options) {
-        return _super.call(this, options) || this;
+    function GetRequest(requestOptions, token, sdkOptions) {
+        return _super.call(this, requestOptions, token, sdkOptions) || this;
     }
-    GetRequest.prototype._getMethod = function () {
-        return httpMethods.Get;
+    GetRequest.prototype.getMethod = function () {
+        return constants_1.HTTP_METHODS.get;
     };
     return GetRequest;
-}(RequestBase));
+}(ExecutableRequest_1.ExecutableRequest));
 exports.GetRequest = GetRequest;
 var GetByIdRequest = /** @class */ (function (_super) {
     tslib_1.__extends(GetByIdRequest, _super);
-    function GetByIdRequest(options) {
-        return _super.call(this, options) || this;
+    function GetByIdRequest(requestOptions, token, sdkOptions) {
+        return _super.call(this, requestOptions, token, sdkOptions) || this;
     }
-    GetByIdRequest.prototype._getMethod = function () {
-        return httpMethods.Get;
+    GetByIdRequest.prototype.getMethod = function () {
+        return constants_1.HTTP_METHODS.get;
     };
     return GetByIdRequest;
-}(RequestBase));
+}(ExecutableRequest_1.ExecutableRequest));
 exports.GetByIdRequest = GetByIdRequest;
 var DeleteRequest = /** @class */ (function (_super) {
     tslib_1.__extends(DeleteRequest, _super);
-    function DeleteRequest(options) {
-        return _super.call(this, options) || this;
+    function DeleteRequest(requestOptions, token, sdkOptions) {
+        return _super.call(this, requestOptions, token, sdkOptions) || this;
     }
-    DeleteRequest.prototype._getMethod = function () {
-        return httpMethods.Delete;
+    DeleteRequest.prototype.getMethod = function () {
+        return constants_1.HTTP_METHODS.delete;
     };
     return DeleteRequest;
-}(RequestBase));
+}(ExecutableRequest_1.ExecutableRequest));
 exports.DeleteRequest = DeleteRequest;
 var UpdateRequest = /** @class */ (function (_super) {
     tslib_1.__extends(UpdateRequest, _super);
-    function UpdateRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this._data = options.data;
-        _this._saveTemp = options.saveTemp;
+    function UpdateRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.data = requestOptions.data;
+        _this.saveTemp = requestOptions.saveTemp;
         return _this;
     }
-    UpdateRequest.prototype._getMethod = function () {
-        return httpMethods.Patch;
+    UpdateRequest.prototype.getMethod = function () {
+        return constants_1.HTTP_METHODS.patch;
     };
-    UpdateRequest.prototype._getBody = function () {
-        var body = utils_1.utils.convertDateFieldToISOString(this._data);
+    UpdateRequest.prototype.getBody = function () {
+        var body = utils_1.utils.convertDateFieldToISOString(this.data);
         return body;
     };
-    UpdateRequest.prototype._getHeaders = function () {
-        var headers = RequestBase.prototype._getHeaders.call(this);
-        if (this._saveTemp) {
-            headers[headerNames.operation] = "SaveTemp";
+    UpdateRequest.prototype.getHeaders = function () {
+        var headers = _super.prototype.getHeaders.call(this);
+        if (this.saveTemp) {
+            headers[constants_1.HEADER_NAMES.operation] = "SaveTemp";
         }
         return headers;
     };
     return UpdateRequest;
-}(RequestBase));
+}(ExecutableRequest_1.ExecutableRequest));
 exports.UpdateRequest = UpdateRequest;
 var CreateRequest = /** @class */ (function (_super) {
     tslib_1.__extends(CreateRequest, _super);
-    function CreateRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this._data = options.data;
+    function CreateRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.data = requestOptions.data;
         return _this;
     }
-    CreateRequest.prototype._getMethod = function () {
-        return httpMethods.Post;
+    CreateRequest.prototype.getMethod = function () {
+        return constants_1.HTTP_METHODS.post;
     };
-    CreateRequest.prototype._getBody = function () {
-        var body = utils_1.utils.convertDateFieldToISOString(this._data);
+    CreateRequest.prototype.getBody = function () {
+        var body = utils_1.utils.convertDateFieldToISOString(this.data);
         return body;
     };
     return CreateRequest;
-}(RequestBase));
+}(ExecutableRequest_1.ExecutableRequest));
 exports.CreateRequest = CreateRequest;
 var GetRelatedRequest = /** @class */ (function (_super) {
     tslib_1.__extends(GetRelatedRequest, _super);
-    function GetRelatedRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this.navigationProperty = options.navigationProperty;
+    function GetRelatedRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.property = requestOptions.property;
         return _this;
     }
-    GetRelatedRequest.prototype._buildUrl = function () {
-        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.navigationProperty;
-        return this._addQueryParameters(url);
+    GetRelatedRequest.prototype.buildUrl = function () {
+        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.property;
+        return this.addQueryParameters(url);
     };
     return GetRelatedRequest;
 }(GetByIdRequest));
 exports.GetRelatedRequest = GetRelatedRequest;
 var GetRelatedByIdRequest = /** @class */ (function (_super) {
     tslib_1.__extends(GetRelatedByIdRequest, _super);
-    function GetRelatedByIdRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this.navigationProperty = options.navigationProperty;
-        _this.relatedKey = options.relatedKey;
+    function GetRelatedByIdRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.property = requestOptions.property;
+        _this.relatedId = requestOptions.relatedId;
         return _this;
     }
-    GetRelatedByIdRequest.prototype._buildUrl = function () {
-        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.navigationProperty + "(" + this.relatedKey + ")";
-        return this._addQueryParameters(url);
+    GetRelatedByIdRequest.prototype.buildUrl = function () {
+        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.property + "(" + this.relatedId + ")";
+        return this.addQueryParameters(url);
     };
     return GetRelatedByIdRequest;
 }(GetByIdRequest));
 exports.GetRelatedByIdRequest = GetRelatedByIdRequest;
 var DeleteRelatedRequest = /** @class */ (function (_super) {
     tslib_1.__extends(DeleteRelatedRequest, _super);
-    function DeleteRelatedRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this.navigationProperty = options.navigationProperty;
+    function DeleteRelatedRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.property = requestOptions.property;
         return _this;
     }
-    DeleteRelatedRequest.prototype._buildUrl = function () {
-        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.navigationProperty + "/$ref";
-        return this._addQueryParameters(url);
+    DeleteRelatedRequest.prototype.buildUrl = function () {
+        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.property + "/$ref";
+        return this.addQueryParameters(url);
     };
     return DeleteRelatedRequest;
 }(DeleteRequest));
 exports.DeleteRelatedRequest = DeleteRelatedRequest;
 var DeleteRelatedByIdRequest = /** @class */ (function (_super) {
     tslib_1.__extends(DeleteRelatedByIdRequest, _super);
-    function DeleteRelatedByIdRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this.navigationProperty = options.navigationProperty;
-        _this.relatedKey = options.relatedKey;
+    function DeleteRelatedByIdRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.property = requestOptions.property;
+        _this.relatedId = requestOptions.relatedId;
         return _this;
     }
-    DeleteRelatedByIdRequest.prototype._buildUrl = function () {
-        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.navigationProperty + "(" + this.relatedKey + ")/$ref";
-        return this._addQueryParameters(url);
+    DeleteRelatedByIdRequest.prototype.buildUrl = function () {
+        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.property + "(" + this.relatedId + ")/$ref";
+        return this.addQueryParameters(url);
     };
     return DeleteRelatedByIdRequest;
 }(DeleteRequest));
 exports.DeleteRelatedByIdRequest = DeleteRelatedByIdRequest;
 var CreateRelatedRequest = /** @class */ (function (_super) {
     tslib_1.__extends(CreateRelatedRequest, _super);
-    function CreateRelatedRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this.navigationProperty = options.navigationProperty;
-        _this.key = options.key;
+    function CreateRelatedRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.property = requestOptions.property;
+        _this.key = requestOptions.key;
         return _this;
     }
-    CreateRelatedRequest.prototype._buildUrl = function () {
-        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.navigationProperty + "/$ref";
-        return this._addQueryParameters(url);
+    CreateRelatedRequest.prototype.buildUrl = function () {
+        var url = this.urlOptions.baseUrl + this.urlOptions.entitySet + "(" + this.key + ")/" + this.property + "/$ref";
+        return this.addQueryParameters(url);
     };
     return CreateRelatedRequest;
 }(CreateRequest));
 exports.CreateRelatedRequest = CreateRelatedRequest;
 var UploadRequest = /** @class */ (function (_super) {
     tslib_1.__extends(UploadRequest, _super);
-    function UploadRequest(options) {
-        var _this = _super.call(this, options) || this;
-        _this.fileName = options.fileName;
-        _this.uploadProperties = options.uploadProperties;
-        _this.contentType = options.contentType;
+    function UploadRequest(requestOptions, token, sdkOptions) {
+        var _this = _super.call(this, requestOptions, token, sdkOptions) || this;
+        _this.fileName = requestOptions.fileName;
+        _this.uploadProperties = requestOptions.uploadProperties;
+        _this.contentType = requestOptions.contentType;
         return _this;
     }
-    UploadRequest.prototype._getHeaders = function () {
-        var headers = _super.prototype._getHeaders.call(this);
-        headers[headerNames.contentType] = this.contentType || "application/octet-stream";
-        headers[headerNames.fileName] = this.fileName;
-        headers[headerNames.properties] = this.uploadProperties;
-        headers[headerNames.contentEncoding] = "identity";
+    UploadRequest.prototype.getHeaders = function () {
+        var headers = _super.prototype.getHeaders.call(this);
+        headers[constants_1.HEADER_NAMES.contentType] = this.contentType || "application/octet-stream";
+        headers[constants_1.HEADER_NAMES.fileName] = this.fileName;
+        headers[constants_1.HEADER_NAMES.properties] = JSON.stringify(this.uploadProperties);
+        headers[constants_1.HEADER_NAMES.contentEncoding] = "identity";
         return headers;
     };
-    UploadRequest.prototype._getBody = function () {
-        return this._data;
+    UploadRequest.prototype.getBody = function () {
+        return this.data;
     };
-    UploadRequest.prototype._getMethod = function () {
+    UploadRequest.prototype.getMethod = function () {
         if (this.key) {
-            return httpMethods.Patch;
+            return constants_1.HTTP_METHODS.patch;
         }
-        return httpMethods.Post;
+        return constants_1.HTTP_METHODS.post;
     };
     return UploadRequest;
 }(CreateRequest));
 exports.UploadRequest = UploadRequest;
 
 
+/***/ }),
+
+/***/ "./src/Requests/RequestBase.ts":
+/*!*************************************!*\
+  !*** ./src/Requests/RequestBase.ts ***!
+  \*************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.RequestBase = void 0;
+var constants_1 = __webpack_require__(/*! ../constants */ "./src/constants.ts");
+var utils_1 = __webpack_require__(/*! ../utils */ "./src/utils.ts");
+var RequestBase = /** @class */ (function () {
+    function RequestBase(options) {
+        this.successCb = options.successCb;
+        this.failureCb = options.failureCb;
+        this.urlOptions = options.urlOptions;
+        this.progressCb = options.progressCb;
+        this.key = options.key;
+        this.action = options.action;
+        this.fallbackProperties = options.fallbackProperties;
+        this.query = options.query;
+    }
+    RequestBase.prototype.getQueryString = function (urlOptions, query) {
+        var paramDictionary = {};
+        this.getQueryParameters(paramDictionary, urlOptions, query);
+        var keys = Object.keys(paramDictionary);
+        if (keys.length == 0)
+            return null;
+        var queryString = "?";
+        for (var prop in paramDictionary) {
+            queryString += prop + "=" + paramDictionary[prop] + "&";
+        }
+        queryString = queryString.substring(0, queryString.length - 1);
+        return queryString;
+    };
+    RequestBase.prototype.getBody = function () {
+        return undefined;
+    };
+    RequestBase.prototype.getMethod = function () {
+        return null;
+    };
+    RequestBase.prototype.getHeaders = function () {
+        var headers = {};
+        headers[constants_1.HEADER_NAMES.contentType] = constants_1.CONTENT_TYPES.json;
+        return headers;
+    };
+    RequestBase.prototype.buildUrl = function () {
+        var url = this.urlOptions.baseUrl + (this.urlOptions.entitySet || "");
+        url += this.key ? ("(" + this.key + ")") : "";
+        if (this.action) {
+            url += url.endsWith("/") ? "" : "/";
+            url += this.action;
+        }
+        // including count here
+        // not the best solution as build() is called once more in getQueryString
+        // but not that big of an issue right now
+        if (this.query) {
+            var getCount = this.query.build().$count;
+            if (utils_1.utils.isBoolean(getCount) && !getCount) {
+                url += "/$count";
+            }
+        }
+        return this.addQueryParameters(url);
+    };
+    RequestBase.prototype.parseResponse = function (http) {
+        var data = utils_1.utils.parseStringToJson(http.responseText);
+        if (data) {
+            if (http.status >= 400 && data.error) {
+                return data.error;
+            }
+            return data;
+        }
+        return http.responseText;
+    };
+    RequestBase.prototype.addQueryParameters = function (url) {
+        var queryString = this.getQueryString(this.urlOptions, this.query);
+        if (queryString) {
+            if (url.indexOf("?") > -1 && queryString[0] == "?") {
+                queryString = "&" + queryString.substring(1);
+            }
+            url += queryString;
+        }
+        return url;
+    };
+    RequestBase.prototype.getQueryParameters = function (paramDictionary, urlOptions, query) {
+        if (query) {
+            var builtQuery = query.build();
+            if (utils_1.utils.isString(builtQuery.$filter))
+                paramDictionary[constants_1.ODATA_PARAMS.$filter] = builtQuery.$filter;
+            if (utils_1.utils.isString(builtQuery.$select))
+                paramDictionary[constants_1.ODATA_PARAMS.$select] = builtQuery.$select;
+            if (utils_1.utils.isString(builtQuery.$expand))
+                paramDictionary[constants_1.ODATA_PARAMS.$expand] = builtQuery.$expand;
+            if (utils_1.utils.isString(builtQuery.$orderby))
+                paramDictionary[constants_1.ODATA_PARAMS.$orderby] = builtQuery.$orderby;
+            if (utils_1.utils.isNumber(builtQuery.$skip))
+                paramDictionary[constants_1.ODATA_PARAMS.$skip] = builtQuery.$skip;
+            if (utils_1.utils.isNumber(builtQuery.$top))
+                paramDictionary[constants_1.ODATA_PARAMS.$top] = builtQuery.$top;
+            if (utils_1.utils.isString(builtQuery.$search))
+                paramDictionary[constants_1.ODATA_PARAMS.$search] = builtQuery.$search;
+            // inline count
+            if (utils_1.utils.isBoolean(builtQuery.$count) && builtQuery.$count)
+                paramDictionary[constants_1.ODATA_PARAMS.$count] = builtQuery.$count;
+        }
+        if (urlOptions.provider) {
+            paramDictionary[constants_1.SF_PARAMS.provider] = urlOptions.provider;
+        }
+        if (urlOptions.culture) {
+            paramDictionary[constants_1.SF_PARAMS.culture] = urlOptions.culture;
+        }
+        if (urlOptions.siteId) {
+            paramDictionary[constants_1.SF_PARAMS.siteId] = urlOptions.siteId;
+        }
+        if (this.fallbackProperties) {
+            paramDictionary[constants_1.SF_PARAMS.fallbackParams] = this.fallbackProperties.join();
+        }
+        if (urlOptions.additionalQueryParams) {
+            for (var key in urlOptions.additionalQueryParams) {
+                if (urlOptions.additionalQueryParams.hasOwnProperty(key)) {
+                    paramDictionary[key] = urlOptions.additionalQueryParams[key];
+                }
+            }
+        }
+    };
+    return RequestBase;
+}());
+exports.RequestBase = RequestBase;
+
+
 /***/ }),
 
 /***/ "./src/Requests/RequestFactory.ts":
 /*!****************************************!*\
   !*** ./src/Requests/RequestFactory.ts ***!
   \****************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.RequestFactory = void 0;
 var Request_1 = __webpack_require__(/*! ./Request */ "./src/Requests/Request.ts");
-var ExecutableRequest_1 = __webpack_require__(/*! ./ExecutableRequest */ "./src/Requests/ExecutableRequest.ts");
-var BatchRequest = __webpack_require__(/*! ./BatchRequest */ "./src/Requests/BatchRequest.ts");
+var BatchRequest_1 = __webpack_require__(/*! ./BatchRequest */ "./src/Requests/BatchRequest.ts");
 var RequestFactory = /** @class */ (function () {
     function RequestFactory(options) {
-        this.token = null;
-        this.handlers = options.handlers;
-        this.enableUnlimitedChoices = options.enableUnlimitedChoices;
-        this.integrationMode = options.integrationMode;
+        this.options = options;
     }
     RequestFactory.prototype.get = function (parameters) {
-        return this.createExecutor(new Request_1.GetRequest(parameters));
+        return new Request_1.GetRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.getSingle = function (parameters) {
-        return this.createExecutor(new Request_1.GetByIdRequest(parameters));
+        return new Request_1.GetByIdRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.create = function (parameters) {
-        return this.createExecutor(new Request_1.CreateRequest(parameters));
+        return new Request_1.CreateRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.update = function (parameters) {
-        return this.createExecutor(new Request_1.UpdateRequest(parameters));
+        return new Request_1.UpdateRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.destroy = function (parameters) {
-        return this.createExecutor(new Request_1.DeleteRequest(parameters));
+        return new Request_1.DeleteRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.getProperty = function (parameters) {
-        return this.createExecutor(new Request_1.GetRelatedRequest(parameters));
+        return new Request_1.GetRelatedRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.getRelated = function (parameters) {
-        return this.createExecutor(new Request_1.GetRelatedRequest(parameters));
+        return new Request_1.GetRelatedRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.getRelatedById = function (parameters) {
-        return this.createExecutor(new Request_1.GetRelatedByIdRequest(parameters));
+        return new Request_1.GetRelatedByIdRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.destroyRelated = function (parameters) {
-        return this.createExecutor(new Request_1.DeleteRelatedRequest(parameters));
+        return new Request_1.DeleteRelatedRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.destroyRelatedById = function (parameters) {
-        return this.createExecutor(new Request_1.DeleteRelatedByIdRequest(parameters));
+        return new Request_1.DeleteRelatedByIdRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.createRelated = function (parameters) {
-        return this.createExecutor(new Request_1.CreateRelatedRequest(parameters));
-    };
-    RequestFactory.prototype.batch = function (parameters) {
-        parameters._factory = this;
-        return new BatchRequest(parameters);
+        return new Request_1.CreateRelatedRequest(parameters, this.token, this.options);
     };
     RequestFactory.prototype.upload = function (parameters) {
-        return this.createExecutor(new Request_1.UploadRequest(parameters));
-    };
-    RequestFactory.prototype.createExecutor = function (request) {
-        var executor = new ExecutableRequest_1.ExecutableRequest({
-            request: request,
-            handlers: this.handlers || {},
-            token: this.token,
-            enableUnlimitedChoices: this.enableUnlimitedChoices,
-            integrationMode: this.integrationMode
-        });
-        // TODO
-        executor.navigationProperty = request.navigationProperty;
-        return executor;
+        return new Request_1.UploadRequest(parameters, this.token, this.options);
+    };
+    RequestFactory.prototype.batch = function (parameters) {
+        var batchParams = parameters;
+        batchParams.factory = this;
+        return new BatchRequest_1.BatchRequest(batchParams, this.token, this.options);
     };
     return RequestFactory;
 }());
@@ -2718,170 +1966,57 @@ exports.RequestFactory = RequestFactory;
 /*!***************************!*\
   !*** ./src/Sitefinity.ts ***!
   \***************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Sitefinity = void 0;
 var RequestFactory_1 = __webpack_require__(/*! ./Requests/RequestFactory */ "./src/Requests/RequestFactory.ts");
-var Authentication_1 = __webpack_require__(/*! ./Authentication */ "./src/Authentication.ts");
 var Data_1 = __webpack_require__(/*! ./Data */ "./src/Data.ts");
 var Query_1 = __webpack_require__(/*! ./Query */ "./src/Query.ts");
 var utils_1 = __webpack_require__(/*! ./utils */ "./src/utils.ts");
-/**
-* @class Sitefinity
-* @classdesc The constructor of the Sitefinity JavaScript SDK. This is the entry point for the SDK.
-* @property {Object} authentication - The authentication object used for authenticating to Sitefinity. See {@link Authentication}
-* @param {object} options - An object containing configuration options for the Setup object.
-* @param {string} options.serviceUrl - Your service url that points to the configured instance of Sitefinity service.
-* @param {string} options.siteId - The ID of the site, for which the query will be executed.
-* @param {string} options.handlers - The global handlers for request execution
-* @param {string} options.handlers.successCb - The success handler.
-* @param {string} options.handlers.failureCb - The failure handler.
-*/
 var Sitefinity = /** @class */ (function () {
+    /**
+    * The constructor of the Sitefinity JavaScript SDK. This is the entry point for the SDK.
+    */
     function Sitefinity(options) {
-        this.profileUrl = utils_1.utils.addTrailingSlash(options.serviceUrl);
+        this.baseUrl = options.baseUrl;
         this.siteId = options.siteId;
-        this.factory = new RequestFactory_1.RequestFactory({
-            handlers: options.handlers,
-            enableUnlimitedChoices: options.enableUnlimitedChoices,
-            integrationMode: options.integrationMode
-        });
-        this.authentication = new Authentication_1.Authentication({
-            serviceUrl: this.profileUrl,
-            factory: this.factory
-        });
+        this.factory = new RequestFactory_1.RequestFactory(options);
     }
-    /**
-* Creates a new {@link Data} class.
-* @memberOf Sitefinity
-* @instance
-* @param {object} options - An object containing configuration options for the Setup object.
-* @param {string} options.urlName - The URL name of the type..
-* @param {string} [options.providerName] - The name of the provider. If empty the default provider for the site will be used.
-* @param {string} [options.cultureName] - The name of the culture. If empty the default culture for the site will be used.
-* @example
-* var data = sf.data({
-*     urlName: "newsitems",
-*     providerName: "OpenAccessDataProvider",
-*     cultureName: "en"
-* });
-* @returns {Data}
-*/
     Sitefinity.prototype.data = function (options) {
-        var optionsServiceUrl = options.serviceUrl ? utils_1.utils.addTrailingSlash(options.serviceUrl) : options.serviceUrl;
-        var dataOptions = {
-            baseUrl: optionsServiceUrl || this.profileUrl,
-            SFParams: {
-                provider: options.providerName,
-                culture: options.cultureName,
-                siteId: options.siteId || this.siteId
-            },
+        var urlOptions = {
+            baseUrl: utils_1.utils.addTrailingSlash(options.baseUrl || this.baseUrl),
+            provider: options.provider,
+            culture: options.culture,
+            siteId: options.siteId || this.siteId,
             additionalQueryParams: options.additionalQueryParams,
-            entitySet: options.urlName
+            entitySet: options.entitySet
         };
-        this.factory.token = this.authentication.getToken();
-        return new Data_1.Data(dataOptions, this.factory);
+        return new Data_1.Data(urlOptions, this.factory);
     };
-    /**
-    * Creates a new {@link BatchRequest} class. OData batch requests -> {@link http://docs.oasis-open.org/odata/odata/v4.0/os/part1-protocol/odata-v4.0-os-part1-protocol.html#_Toc372793748}
-    * @memberOf Sitefinity
-    * @instance
-    * @param {Function} success - The success callback of the batch execution.
-    * @param {string} options.urlName - The URL name of the type..
-    * @param {string} [options.providerName] - The name of the provider. If empty the default provider for the site will be used.
-    * @param {string} [options.cultureName] - The name of the culture. If empty the default culture for the site will be used.
-    * @example
-    * var sf = new Sitefinity({
-    *   serviceUrl: 'http://mydomain/route/service/'
-    * });
-    *
-    * var batch = sf.batch(successCbBatch, failureCb);
-    * batch.get({
-    *     entitySet: entitySet,
-    *     query: query8
-    * });
-    *
-    * var transaction = batch.beginTransaction();
-    * var createId = transaction.create({
-    *     entitySet: entitySet,
-    *     data: newsItem
-    * });
-    *
-    * batch.endTransaction(transaction);
-    *
-    * var transaction2 = batch.beginTransaction();
-    * var createId2 = transaction2.create({
-    *     entitySet: entitySet,
-    *     data: newsItem
-    * });
-    *
-    * var updateId2 = transaction2.update({
-    *     entitySet: entitySet,
-    *     key: createId2,
-    *     data: newsItemUpdate
-    * });
-    *
-    * batch.endTransaction(transaction2);
-    *
-    * batch.get({
-    *     entitySet: entitySet
-    * });
-    *
-    * batch.execute();
-    * @returns {BatchRequest}
-    */
     Sitefinity.prototype.batch = function (success, failure, progress, options) {
-        if (typeof progress !== 'function') {
-            options = progress;
-            progress = null;
-        }
         if (!options)
             options = {};
-        this.factory.token = this.authentication.getToken();
-        var optionsServiceUrl = options.serviceUrl ? utils_1.utils.addTrailingSlash(options.serviceUrl) : options.serviceUrl;
         var batch = this.factory.batch({
             successCb: success,
             failureCb: failure,
             progressCb: progress,
             urlOptions: {
-                baseUrl: optionsServiceUrl || this.profileUrl,
-                SFParams: {
-                    provider: options.providerName,
-                    culture: options.cultureName,
-                    siteId: options.siteId || this.siteId
-                },
+                baseUrl: utils_1.utils.addTrailingSlash(options.baseUrl || this.baseUrl),
+                provider: options.provider,
+                culture: options.culture,
+                siteId: options.siteId || this.siteId,
                 additionalQueryParams: options.additionalQueryParams
             }
         });
-        var executor = this.factory.createExecutor(batch);
-        executor.beginTransaction = function () {
-            return batch.beginTransaction();
-        };
-        executor.endTransaction = function (transaction) {
-            batch.endTransaction(transaction);
-        };
-        executor.get = function (options) {
-            batch.constructor.prototype.get.call(batch, options);
-        };
-        executor.getOperations = function (options) {
-            batch.constructor.prototype.getOperations.call(batch, options);
-        };
-        executor.getSingle = function (options) {
-            batch.constructor.prototype.getSingle.call(batch, options);
-        };
-        executor.getProperty = function (options) {
-            batch.constructor.prototype.getProperty.call(batch, options);
-        };
-        executor.getRelated = function (options) {
-            batch.constructor.prototype.getRelated.call(batch, options);
-        };
-        executor.getRelatedById = function (options) {
-            batch.constructor.prototype.getRelatedById.call(batch, options);
-        };
-        return executor;
+        return batch;
+    };
+    /**
+    * Sets the authentication token.
+    */
+    Sitefinity.prototype.setToken = function (token) {
+        this.factory.token = token;
     };
     Sitefinity.Query = Query_1.Query;
     return Sitefinity;
@@ -2895,198 +2030,129 @@ exports.Sitefinity = Sitefinity;
 /*!***************************!*\
   !*** ./src/WhereQuery.ts ***!
   \***************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.WhereQuery = void 0;
 var Expression_1 = __webpack_require__(/*! ./Expression */ "./src/Expression.ts");
-var OperatorType = __webpack_require__(/*! ./constants */ "./src/constants.ts").default.ExpressionType;
+var constants_1 = __webpack_require__(/*! ./constants */ "./src/constants.ts");
 /**
- * @classdesc A fluent API operation for creating a filter for a query by chaining different rules.
- * @class WhereQuery
- * @protected
+ * A fluent API operation for creating a filter for a query by chaining different rules.
  */
 var WhereQuery = /** @class */ (function () {
     function WhereQuery(parent, type) {
-        if (type === void 0) { type = OperatorType.and; }
+        if (type === void 0) { type = constants_1.EXPRESSION_TYPE.and; }
         this.parent = parent;
         this.expression = new Expression_1.ComplexExpression(type, []);
     }
     /**
     * Adds an `and` clause to the current condition and returns it for further chaining.
-    * @method and
-    * @memberOf WhereQuery.prototype
-    * @returns {WhereQuery}
     */
     WhereQuery.prototype.and = function () {
-        return new WhereQuery(this, OperatorType.and);
+        return new WhereQuery(this, constants_1.EXPRESSION_TYPE.and);
     };
     /**
      * Adds an `or` clause to the current condition and returns it for further chaining.
-     * @method or
-     * @memberOf WhereQuery.prototype
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.or = function () {
-        return new WhereQuery(this, OperatorType.or);
+        return new WhereQuery(this, constants_1.EXPRESSION_TYPE.or);
     };
     /**
      * Adds an `any` clause to the current condition and returns it for further chaining.
-     * @method any
-     * @memberOf WhereQuery.prototype
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.any = function () {
-        return new WhereQuery(this, OperatorType.any);
+        return new WhereQuery(this, constants_1.EXPRESSION_TYPE.any);
     };
     /**
      * Adds a `not` clause to the current condition and returns it for further chaining.
-     * @method not
-     * @memberOf WhereQuery.prototype
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.not = function () {
-        return new WhereQuery(this, OperatorType.not);
-    };
-    WhereQuery.prototype._simple = function (type, parameter, constant, caseSensitive) {
-        if (caseSensitive === void 0) { caseSensitive = true; }
-        var currentExpr = new Expression_1.BinaryExpression(type, parameter, constant, caseSensitive);
-        var subExpressions = this.expression.getExpressions();
-        subExpressions.push(currentExpr);
-        if (this.expression.getType() === OperatorType.not && subExpressions.length > 1)
-            throw new Error("Invalid operators count!");
-        return this;
+        return new WhereQuery(this, constants_1.EXPRESSION_TYPE.not);
     };
     /**
      * Adds a condition that a field must be equal to a specific value.
-     * @method eq
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {*} value Comparison value (to which the fields must be equal).
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.eq = function (parameter, constant) {
-        return this._simple(OperatorType.eq, parameter, constant);
+        return this.simple(constants_1.EXPRESSION_TYPE.eq, parameter, constant);
     };
     /**
      * Adds a condition that a field must *not* be equal to a specific value.
-     * @method ne
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {*} value Comparison value (to which the field must not be equal).
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.ne = function (parameter, constant) {
-        return this._simple(OperatorType.ne, parameter, constant);
+        return this.simple(constants_1.EXPRESSION_TYPE.ne, parameter, constant);
     };
     /**
      * Adds a condition that a field must be `greater than` a certain value. Applicable to Number, String, and Date fields.
-     * @method gt
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {*} value Comparison value (that the field should be greater than).
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.gt = function (parameter, constant) {
-        return this._simple(OperatorType.gt, parameter, constant);
+        return this.simple(constants_1.EXPRESSION_TYPE.gt, parameter, constant);
     };
     /**
      * Adds a condition that a field must be `greater than or equal` to a certain value. Applicable to Number, String, and Date fields.
-     * @method gte
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {*} value Comparison value (that the field should be greater than or equal to).
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.gte = function (parameter, constant) {
-        return this._simple(OperatorType.ge, parameter, constant);
+        return this.simple(constants_1.EXPRESSION_TYPE.ge, parameter, constant);
     };
     /**
      * Adds a condition that a field must be `less than` a certain value. Applicable to Number, String, and Date fields.
-     * @method lt
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {*} value Comparison value (that the field should be less than).
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.lt = function (parameter, constant) {
-        return this._simple(OperatorType.lt, parameter, constant);
+        return this.simple(constants_1.EXPRESSION_TYPE.lt, parameter, constant);
     };
     /**
      * Adds a condition that a field must be `less than or equal` to a certain value. Applicable to Number, String, and Date fields.
-     * @method lte
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {*} value Comparison value (that the field should be less than or equal to).
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.lte = function (parameter, constant) {
-        return this._simple(OperatorType.le, parameter, constant);
+        return this.simple(constants_1.EXPRESSION_TYPE.le, parameter, constant);
     };
     /**
      * Adds a condition that a field value must *start* with a specified string.
-     * @method startsWith
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {string} value The string that the field should start with.
-     * @param {boolean} caseSensitive A flag indicating if tolower should be applied to the parameter
-     * @param {string} [options] A string of regex options to use. See [specs](http://docs.mongodb.org/manual/reference/operator/query/regex/#op._S_options) for a description of available options.
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.startsWith = function (parameter, constant, caseSensitive) {
         if (caseSensitive === void 0) { caseSensitive = true; }
-        return this._simple(OperatorType.startsWith, parameter, constant, caseSensitive);
+        return this.simple(constants_1.EXPRESSION_TYPE.startsWith, parameter, constant, caseSensitive);
     };
     /**
      * Adds a condition that a field value must *contain* a specified string.
-     * @method startsWith
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {string} value The string that the field should start with.
-     * @param {boolean} caseSensitive A flag indicating if tolower should be applied to the parameter
-     * @param {string} [options] A string of regex options to use. See [specs](http://docs.mongodb.org/manual/reference/operator/query/regex/#op._S_options) for a description of available options.
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.contains = function (parameter, constant, caseSensitive) {
         if (caseSensitive === void 0) { caseSensitive = true; }
-        return this._simple(OperatorType.contains, parameter, constant, caseSensitive);
+        return this.simple(constants_1.EXPRESSION_TYPE.contains, parameter, constant, caseSensitive);
     };
     /**
      * Adds a condition that a field value must *end* with a specified string.
-     * @method endsWith
-     * @memberOf WhereQuery.prototype
-     * @param {string} field Field name.
-     * @param {string} value The string that the field should end with.
-     * @param {boolean} caseSensitive A flag indicating if tolower should be applied to the parameter
-     * @param {string} [options] A string of  regex options to use. See [specs](http://docs.mongodb.org/manual/reference/operator/query/regex/#op._S_options) for a description of available options.
-     * @returns {WhereQuery}
      */
     WhereQuery.prototype.endsWith = function (parameter, constant, caseSensitive) {
         if (caseSensitive === void 0) { caseSensitive = true; }
-        return this._simple(OperatorType.endsWith, parameter, constant, caseSensitive);
+        return this.simple(constants_1.EXPRESSION_TYPE.endsWith, parameter, constant, caseSensitive);
     };
     /**
      * Ends the definition of the current WhereQuery. You need to call this method in order to continue with the definition of the parent {@link QueryBase}. All other `WhereQuery` methods return the current instance of `WhereQuery` to allow chaining.
-     * @method done
-     * @memberOf WhereQuery.prototype
-     * @returns {Query}
      */
     WhereQuery.prototype.done = function () {
         if (this.parent instanceof WhereQuery) {
-            this.parent._addComplexExpression(this);
+            this.parent.addComplexExpression(this);
             // TODO: If has and() || or() must call done() twice
-            if (this.expression.getType() === OperatorType.not)
+            if (this.expression.getType() === constants_1.EXPRESSION_TYPE.not)
                 return this.parent;
         }
         return this.parent;
     };
-    WhereQuery.prototype._getExpression = function () {
+    WhereQuery.prototype.getExpression = function () {
         return this.expression;
     };
-    WhereQuery.prototype._addComplexExpression = function (subQuery) {
-        var subExpression = subQuery._getExpression();
+    WhereQuery.prototype.simple = function (type, parameter, constant, caseSensitive) {
+        if (caseSensitive === void 0) { caseSensitive = true; }
+        var currentExpr = new Expression_1.BinaryExpression(type, parameter, constant, caseSensitive);
+        var subExpressions = this.expression.getExpressions();
+        subExpressions.push(currentExpr);
+        if (this.expression.getType() === constants_1.EXPRESSION_TYPE.not && subExpressions.length > 1)
+            throw new Error("Invalid operators count!");
+        return this;
+    };
+    WhereQuery.prototype.addComplexExpression = function (subQuery) {
+        var subExpression = subQuery.getExpression();
         this.expression.getExpressions().push(subExpression);
     };
     return WhereQuery;
@@ -3100,68 +2166,66 @@ exports.WhereQuery = WhereQuery;
 /*!**************************!*\
   !*** ./src/constants.ts ***!
   \**************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var constants = {
-    ExpressionType: {
-        query: 1,
-        where: 100,
-        and: 'and',
-        or: 'or',
-        not: 'not',
-        eq: 'eq',
-        ne: 'ne',
-        lt: 'lt',
-        le: 'le',
-        gt: 'gt',
-        ge: 'ge',
-        any: 'any',
-        /*isin: 126,
-        notin: 127,
-        all: 128,
-        size: 129,
-        regex: 130,*/
-        contains: 'contains',
-        startsWith: 'startsWith',
-        endsWith: 'endsWith'
-    },
-    ODataParams: {
-        $filter: '$filter',
-        $select: '$select',
-        $expand: '$expand',
-        $orderby: '$orderby',
-        $skip: '$skip',
-        $top: '$top',
-        $count: '$count',
-        $search: '$search'
-    },
-    SfParams: {
-        provider: 'sf_provider',
-        culture: 'sf_culture',
-        siteId: 'sf_site'
-    }
+/***/ ((__unused_webpack_module, exports) => {
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CONTENT_TYPES = exports.HTTP_METHODS = exports.HEADER_NAMES = exports.SF_PARAMS = exports.ODATA_PARAMS = exports.EXPRESSION_TYPE = void 0;
+exports.EXPRESSION_TYPE = {
+    query: 1,
+    where: 100,
+    and: 'and',
+    or: 'or',
+    not: 'not',
+    eq: 'eq',
+    ne: 'ne',
+    lt: 'lt',
+    le: 'le',
+    gt: 'gt',
+    ge: 'ge',
+    any: 'any',
+    contains: 'contains',
+    startsWith: 'startsWith',
+    endsWith: 'endsWith'
+};
+exports.ODATA_PARAMS = {
+    $filter: '$filter',
+    $select: '$select',
+    $expand: '$expand',
+    $orderby: '$orderby',
+    $skip: '$skip',
+    $top: '$top',
+    $count: '$count',
+    $search: '$search'
+};
+exports.SF_PARAMS = {
+    provider: 'sf_provider',
+    culture: 'sf_culture',
+    siteId: 'sf_site',
+    fallbackParams: "sf_fallback_prop_names",
+    parentId: "parentId"
+};
+exports.HEADER_NAMES = {
+    contentType: "Content-Type",
+    authorization: "Authorization",
+    contentEncoding: "Content-Encoding",
+    operation: "X-Operation",
+    properties: "X-Sf-Properties",
+    fileName: "X-File-Name",
+    serviceRequest: "X-SF-Service-Request",
+    choicesBinaryRepresentation: "X-SF-Binary-Choice-Representation",
+    integrationMode: "X-SF-Integration-Mode"
+};
+exports.HTTP_METHODS = {
+    get: "GET",
+    put: "PUT",
+    post: "POST",
+    patch: "PATCH",
+    delete: "DELETE"
+};
+exports.CONTENT_TYPES = {
+    json: "application/json"
 };
-exports.default = constants;
-
-
-/***/ }),
-
-/***/ "./src/main.ts":
-/*!*********************!*\
-  !*** ./src/main.ts ***!
-  \*********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", { value: true });
-var Sitefinity_1 = __webpack_require__(/*! ./Sitefinity */ "./src/Sitefinity.ts");
-module.exports = Sitefinity_1.Sitefinity;
 
 
 /***/ }),
@@ -3170,12 +2234,11 @@ module.exports = Sitefinity_1.Sitefinity;
 /*!**********************!*\
   !*** ./src/utils.ts ***!
   \**********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ ((__unused_webpack_module, exports) => {
 
-"use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.utils = void 0;
 var utils = /** @class */ (function () {
     function utils() {
     }
@@ -3188,11 +2251,12 @@ var utils = /** @class */ (function () {
     utils.isBlob = function (obj) {
         return obj instanceof Blob;
     };
-    ;
     utils.isNumber = function (value) {
         return typeof value === 'number' && isFinite(value);
     };
-    ;
+    utils.isFunction = function (func) {
+        return typeof func === 'function';
+    };
     utils.serializeToJSON = function (data) {
         if (!utils.isString(data) && !this.isBlob(data)) {
             return JSON.stringify(data);
@@ -3215,7 +2279,20 @@ var utils = /** @class */ (function () {
         catch (e) {
             console.log("An unexpected error occurred while parsing the response from server: " + e.message + ". Response body was: '" + data + "'");
         }
-        return result;
+        return result;
+    };
+    utils.convertDateFieldToISOString = function (data) {
+        /*
+        TODOSDK: when write tests for this try to use
+        "Object.keys(obj).forEach(function(){})",
+        Phantomjs does not recognize "for..in" operator.
+        */
+        for (var obj in data) {
+            if (data[obj] instanceof Date) {
+                data[obj] = data[obj].toISOString();
+            }
+        }
+        return data;
     };
     utils.hex16 = function () {
         return Math.floor((1 + Math.random()) * 0x10000).toString(16).substr(1);
@@ -3227,9 +2304,6 @@ var utils = /** @class */ (function () {
     };
     utils.removeSlashes = function (url) {
         var ret = url;
-        var fistChar = ret.substr(0, 1);
-        if (fistChar == '/')
-            ret = ret.substr(1);
         var lastChar = ret.substr(-1);
         if (lastChar == '/')
             ret = ret.substr(0, ret.length - 1);
@@ -3269,26 +2343,353 @@ var utils = /** @class */ (function () {
         }
         return date;
     };
-    utils.convertDateFieldToISOString = function (data) {
-        /*
-        TODOSDK: when write tests for this try to use
-        "Object.keys(obj).forEach(function(){})",
-        Phantomjs does not recognize "for..in" operator.
-        */
-        for (var obj in data) {
-            if (data[obj] instanceof Date) {
-                data[obj] = data[obj].toISOString();
-            }
-        }
-        return data;
-    };
     return utils;
 }());
 exports.utils = utils;
 
 
+/***/ }),
+
+/***/ "./node_modules/tslib/tslib.es6.js":
+/*!*****************************************!*\
+  !*** ./node_modules/tslib/tslib.es6.js ***!
+  \*****************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "__extends": () => (/* binding */ __extends),
+/* harmony export */   "__assign": () => (/* binding */ __assign),
+/* harmony export */   "__rest": () => (/* binding */ __rest),
+/* harmony export */   "__decorate": () => (/* binding */ __decorate),
+/* harmony export */   "__param": () => (/* binding */ __param),
+/* harmony export */   "__metadata": () => (/* binding */ __metadata),
+/* harmony export */   "__awaiter": () => (/* binding */ __awaiter),
+/* harmony export */   "__generator": () => (/* binding */ __generator),
+/* harmony export */   "__createBinding": () => (/* binding */ __createBinding),
+/* harmony export */   "__exportStar": () => (/* binding */ __exportStar),
+/* harmony export */   "__values": () => (/* binding */ __values),
+/* harmony export */   "__read": () => (/* binding */ __read),
+/* harmony export */   "__spread": () => (/* binding */ __spread),
+/* harmony export */   "__spreadArrays": () => (/* binding */ __spreadArrays),
+/* harmony export */   "__spreadArray": () => (/* binding */ __spreadArray),
+/* harmony export */   "__await": () => (/* binding */ __await),
+/* harmony export */   "__asyncGenerator": () => (/* binding */ __asyncGenerator),
+/* harmony export */   "__asyncDelegator": () => (/* binding */ __asyncDelegator),
+/* harmony export */   "__asyncValues": () => (/* binding */ __asyncValues),
+/* harmony export */   "__makeTemplateObject": () => (/* binding */ __makeTemplateObject),
+/* harmony export */   "__importStar": () => (/* binding */ __importStar),
+/* harmony export */   "__importDefault": () => (/* binding */ __importDefault),
+/* harmony export */   "__classPrivateFieldGet": () => (/* binding */ __classPrivateFieldGet),
+/* harmony export */   "__classPrivateFieldSet": () => (/* binding */ __classPrivateFieldSet)
+/* harmony export */ });
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise */
+
+var extendStatics = function(d, b) {
+    extendStatics = Object.setPrototypeOf ||
+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+        function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+};
+
+function __extends(d, b) {
+    if (typeof b !== "function" && b !== null)
+        throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+}
+
+var __assign = function() {
+    __assign = Object.assign || function __assign(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    }
+    return __assign.apply(this, arguments);
+}
+
+function __rest(s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+}
+
+function __decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+
+function __param(paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+}
+
+function __metadata(metadataKey, metadataValue) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
+}
+
+function __awaiter(thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+}
+
+function __generator(thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+}
+
+var __createBinding = Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+});
+
+function __exportStar(m, o) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(o, p)) __createBinding(o, m, p);
+}
+
+function __values(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+}
+
+function __read(o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+}
+
+/** @deprecated */
+function __spread() {
+    for (var ar = [], i = 0; i < arguments.length; i++)
+        ar = ar.concat(__read(arguments[i]));
+    return ar;
+}
+
+/** @deprecated */
+function __spreadArrays() {
+    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
+    for (var r = Array(s), k = 0, i = 0; i < il; i++)
+        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
+            r[k] = a[j];
+    return r;
+}
+
+function __spreadArray(to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+}
+
+function __await(v) {
+    return this instanceof __await ? (this.v = v, this) : new __await(v);
+}
+
+function __asyncGenerator(thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+}
+
+function __asyncDelegator(o) {
+    var i, p;
+    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
+}
+
+function __asyncValues(o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+}
+
+function __makeTemplateObject(cooked, raw) {
+    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+    return cooked;
+};
+
+var __setModuleDefault = Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+};
+
+function __importStar(mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+}
+
+function __importDefault(mod) {
+    return (mod && mod.__esModule) ? mod : { default: mod };
+}
+
+function __classPrivateFieldGet(receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+}
+
+function __classPrivateFieldSet(receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+}
+
+
 /***/ })
 
-/******/ });
+/******/ 	});
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/ 	
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/ 	
+/******/ 		// Execute the module function
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/ 	
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/ 	
+/************************************************************************/
+/******/ 	/* webpack/runtime/define property getters */
+/******/ 	(() => {
+/******/ 		// define getter functions for harmony exports
+/******/ 		__webpack_require__.d = (exports, definition) => {
+/******/ 			for(var key in definition) {
+/******/ 				if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+/******/ 					Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ 				}
+/******/ 			}
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/hasOwnProperty shorthand */
+/******/ 	(() => {
+/******/ 		__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/make namespace object */
+/******/ 	(() => {
+/******/ 		// define __esModule on exports
+/******/ 		__webpack_require__.r = (exports) => {
+/******/ 			if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 				Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 			}
+/******/ 			Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/************************************************************************/
+/******/ 	
+/******/ 	// startup
+/******/ 	// Load entry module and return exports
+/******/ 	// This entry module is referenced by other modules so it can't be inlined
+/******/ 	var __webpack_exports__ = __webpack_require__("./sitefinity-webservices-sdk.ts");
+/******/ 	
+/******/ 	return __webpack_exports__;
+/******/ })()
+;
 });
 //# sourceMappingURL=sitefinity-webservices-sdk.js.map